Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29167
Modified Files:
netcdf.info
Added Files:
netcdf.patch
Log Message:
new upstream version - fortran interface now in a separate package.
--- NEW FILE: netcdf.patch ---
--- netcdf-3.6.2/Makefile.am.orig 2007-02-21 16:25:37.000000000 -0500
+++ netcdf-3.6.2/Makefile.am 2007-03-23 20:45:58.000000000 -0400
@@ -24,6 +24,11 @@
F77_TEST = nf_test
endif
+# Does the user want C API?
+if BUILD_C
+LIBSRC = libsrc
+endif
+
# Does the user want C++ API?
if BUILD_CXX
CXX_DIR = cxx
@@ -57,7 +62,7 @@
# This is the list of subdirs for which Makefiles will be constructed
# and run. ncgen must come before ncdump and cxx, because their tests
# depend on it. nf_test depends upon ncgen as well.
-SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP) \
+SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC) $(V2_TEST) $(NCGEN) $(NCDUMP)
\
$(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES)
# make test should do the same as make check.
--- netcdf-3.6.2/Makefile.in.orig 2007-03-01 17:46:18.000000000 -0500
+++ netcdf-3.6.2/Makefile.in 2007-03-23 20:46:07.000000000 -0400
@@ -263,6 +263,9 @@
@[EMAIL PROTECTED] = fortran
@[EMAIL PROTECTED] = nf_test
+# Does the user want C API?
[EMAIL PROTECTED]@LIBSRC = libsrc
+
# Does the user want C++ API?
@[EMAIL PROTECTED] = cxx
@@ -283,7 +286,7 @@
# This is the list of subdirs for which Makefiles will be constructed
# and run. ncgen must come before ncdump and cxx, because their tests
# depend on it. nf_test depends upon ncgen as well.
-SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP) \
+SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC) $(V2_TEST) $(NCGEN) $(NCDUMP)
\
$(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES)
--- netcdf-3.6.2/f90/netcdf_f90.3.orig 2006-08-14 15:32:52.000000000 -0400
+++ netcdf-3.6.2/f90/netcdf_f90.3 2007-03-23 23:12:15.000000000 -0400
@@ -456,7 +456,7 @@
and the name of the variable.
.RE
.HP
-\fBfunction nf90_Inqire_Variable(\fIncid\fP, \fIvarid\fP, \fIname\fP,
+\fBfunction nf90_inquire_variable(\fIncid\fP, \fIvarid\fP, \fIname\fP,
\fIxtype\fP, \fIndims\fP, \fIdimids\fP, \fInatts\fP)\fR
.RS
.nf
--- netcdf-3.6.2/man/netcdf_f90-man.html.orig 2007-03-01 17:48:13.000000000
-0500
+++ netcdf-3.6.2/man/netcdf_f90-man.html 2007-03-23 23:12:59.000000000
-0400
@@ -713,7 +713,7 @@
<tr valign="top" align="left">
<td width="10%"></td>
<td width="89%">
-<p><b>function nf90_Inqire_Variable(</b><i>ncid</i><b>,</b>
+<p><b>function nf90_inquire_variable(</b><i>ncid</i><b>,</b>
<i>varid</i><b>,</b> <i>name</i><b>,</b>
<i>xtype</i><b>,</b> <i>ndims</i><b>,</b>
<i>dimids</i><b>,</b> <i>natts</i><b>)</b></p></td>
--- netcdf-3.6.2/cxx/Makefile.am.orig 2007-02-27 10:44:33.000000000 -0500
+++ netcdf-3.6.2/cxx/Makefile.am 2007-03-24 15:32:32.000000000 -0400
@@ -68,9 +68,8 @@
else # not USE_NETCDF4
-# Point pre-processor and linker to netcdf-3 directory (libsrc).
+# Point pre-processor to netcdf-3 directory (libsrc).
AM_CPPFLAGS += -I$(top_srcdir)/libsrc
-AM_LDFLAGS = -L. -L$(top_builddir)/libsrc
# Link to the netCDF-3 library and the C++ library.
LDADD = $(top_builddir)/cxx/libnetcdf_c++.la
$(top_builddir)/libsrc/libnetcdf.la
--- netcdf-3.6.2/cxx/Makefile.in.orig 2007-03-01 17:46:14.000000000 -0500
+++ netcdf-3.6.2/cxx/Makefile.in 2007-03-24 15:33:51.000000000 -0400
@@ -318,7 +318,6 @@
tst_failure_SOURCES = tst_failure.cpp
XFAIL_TESTS = tst_failure$(EXEEXT)
TESTS = $(TESTFILES) $(am__append_1) $(am__append_6)
[EMAIL PROTECTED]@AM_LDFLAGS = -L. -L$(top_builddir)/libsrc
@[EMAIL PROTECTED] = -L. -L$(top_builddir)/libsrc4 \
@USE_NETCDF4_TRUE@ $(am__append_4)
Index: netcdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/netcdf.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- netcdf.info 31 Jan 2007 22:20:37 -0000 1.6
+++ netcdf.info 20 Apr 2007 02:13:39 -0000 1.7
@@ -1,70 +1,79 @@
Package: netcdf
-Version: 3.6.1
-Revision: 1003
+Version: 3.6.2
+Revision: 6
BuildDependsOnly: True
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: %N-shlibs (= %v-%r) | netcdf-absoft-shlibs (>= 3.5.1-3), %N-bin |
netcdf-absoft-bin
-BuildDepends: g95 (>= 0.50-20060321)
-Conflicts: netcdf-absoft
-Replaces: netcdf-absoft
-GCC: 4.0
-Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
-SourceDirectory: %N-%v/src
-Source-MD5: 07a9db424337c5e4833fb84136e09a1e
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-NoSetLDFLAGS: true
-SetCPPFLAGS: -DNDEBUG -Df2cFortran
-CompileScript: <<
- #!/bin/sh -ev
- CXX="g++" CC="gcc" CXXFLAGS="-O2" CFLAGS='-O2' FC='%p/bin/g95' FFLAGS='-O2'
F90='%p/bin/g95' ./configure --prefix=%p/%n
- make
- #make check
+Depends: %n-shlibs (= %v-%r), %n-bin (= %v-%r)
+Conflicts: %n-absoft
+Replaces: %n-absoft
+Source: ftp://ftp.unidata.ucar.edu/pub/%n/%n-%v.tar.gz
+Source-MD5: a7d450da9081e4a6e440705ea31868d3
+SourceDirectory: %n-%v
+NoSetCPPFlags: true
+Patch: %n.patch
+ConfigureParams: <<
+ --enable-shared CFLAGS=-O2 CXXFLAGS=-O2 \
+ --mandir='${prefix}/share/man' --enable-docs-install
--docdir='${prefix}/share/doc/%n' \
+ --disable-dependency-tracking --disable-fortran-compiler-check --disable-f77
--disable-f90
<<
InstallScript: <<
- #!/bin/sh -ev
- mkdir -p %i/share/man
- make install prefix=%i MANDIR=%i/share/man
- gcclib=`%p/bin/g95 --print-lib`
- FLIBDIR=`dirname $gcclib`
- (mkdir libtmp; cd libtmp; ar -x ../libsrc/libnetcdf.a) || exit 1
- (mkdir libtmp2; cd libtmp2; ar -x ../cxx/libnetcdf_c++.a) || exit 1
- (cd libtmp; objfiles=`ls -1 *.o`; cc -dynamiclib -single_module -o
libnetcdf.%v.dylib $objfiles -L$FLIBDIR -lf95 -install_name
%p/lib/libnetcdf.3.dylib -current_version %v -compatibility_version 3.5; cp
libnetcdf.%v.dylib %i/lib) || exit 1
- (cd %i/lib; ln -s %p/lib/libnetcdf.%v.dylib libnetcdf.3.dylib; ln -s
%p/lib/libnetcdf.3.dylib libnetcdf.dylib; ln -s %p/lib/libnetcdf.%v.dylib
libnetcdf.3.5.0.dylib) || exit 1
- (cd libtmp2; objfiles=`ls -1 *.o`; c++ -dynamiclib -flat_namespace -undefined
suppress -o libnetcdf_c++.%v.dylib $objfiles -install_name
%p/lib/libnetcdf_c++.3.dylib -current_version %v -compatibility_version 3.5; cp
libnetcdf_c++.%v.dylib %i/lib) || exit 1
- (cd %i/lib; ln -s %p/lib/libnetcdf_c++.%v.dylib libnetcdf_c++.3.dylib; ln -s
%p/lib/libnetcdf_c++.3.dylib libnetcdf_c++.dylib) || exit 1
- rm -rf %i/share/man/man3f
- rm -rf %i/share/man/cat1
- rm -rf %i/share/man/cat3
- rm -f %i/share/man/whatis.db
+ #!/bin/sh -ev
+ make prefix=%i install
+ # Add C, CDL and CXX examples
+ mkdir -p %i/share/doc/%N/examples
+ cp -r examples/C* %i/share/doc/%N/examples
+ # Remove duplicate and Fortran documentation
+ rm -f %i/share/doc/%N/*.{ps,txt,info}
+ rm -f %i/share/info/netcdf-f*.info
+ # For backward compatability of old shlibs
+ cd %i/lib
+ ln -s libnetcdf.{4,3}.dylib
+ ln -s libnetcdf_c++.{4,3}.dylib
<<
SplitOff: <<
- Package: %N-shlibs
- Shlibs: <<
- %p/lib/libnetcdf.3.5.0.dylib 3.5.0 %n (>= 3.5.1-14) | netcdf-absoft-shlibs
(>= 3.5.1-3)
- %p/lib/libnetcdf.3.dylib 3.5.0 %n (>= 3.5.1-14) | netcdf-absoft-shlibs (>=
3.5.1-3)
- %p/lib/libnetcdf_c++.3.dylib 3.5.0 %n (>= 3.5.1-14) | netcdf-absoft-shlibs
(>= 3.5.1-3)
- <<
- Conflicts: netcdf-absoft-shlibs
- Replaces: %N (<= 3.5.0-6), netcdf-absoft-shlibs, netcdf-absoft (<= 3.5.1-2)
- Files: lib/libnetcdf*.*.dylib
- DocFiles: COPYRIGHT README RELEASE_NOTES
+ Package: %N-shlibs
+ Conflicts: %N-absoft-shlibs
+ Replaces: %N-absoft-shlibs, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2)
+ Suggests: %N-bin
+ Files: lib/libnetcdf.*.dylib lib/libnetcdf_c++.*.dylib
+ Shlibs: <<
+ %p/lib/libnetcdf.4.dylib 5.0.0 %n (>= 3.6.2-1)
+ %p/lib/libnetcdf_c++.4.dylib 5.0.0 %n (>= 3.6.2-1)
+ <<
+ DocFiles: COPYRIGHT README RELEASE_NOTES
<<
SplitOff2: <<
Package: %N-bin
- Conflicts: netcdf-absoft-bin
- Replaces: %N (<= 3.5.0-6), netcdf-absoft-bin, netcdf-absoft (<= 3.5.1-2)
- Files: 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)
+ Files: bin share/man/man1 share/doc/%N/*-man-1.html
DocFiles: COPYRIGHT README RELEASE_NOTES
<<
DocFiles: COPYRIGHT README RELEASE_NOTES
+InfoDocs: netcdf-install.info netcdf-tutorial.info netcdf.info netcdf-c.info
netcdf-cxx.info
Description: Interface & lib for array-based data access
DescDetail: <<
-The NetCDF (network Common Data Form) library defines a machine-independent
+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.
-Uses g95 to build fortran77 and fortran95 interface.
+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 package,
+`%N-g95', or `%N-gfortran'.
<<
-Homepage: http://www.unidata.ucar.edu/packages/netcdf/
+DescPackaging: <<
+The Fortran interface is moved to a different package so that users
+do not have to install a Fortran compiler to just get the C/C++ interface.
+<<
+DescPort: <<
+CFLAGS=-O2 CXXFLAGS=-O2 is essential to avoid debugging mode flags (-g).
+Included examples in documents directory.
+Removed non-essential duplicate documentation (.ps and .txt).
+Added links to new shlibs for backwards compatibility. This works for the C
+interface only, not for the Fortran interface. But since Fink did not have
+any dependencies on the Fortran interface, there is no reason to create
netcdf4.
+<<
+Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
