Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv3790
Modified Files:
libdap9.info libnc-dap3.info
Added Files:
libdap10.info libdap10.patch
Removed Files:
libdap3.info libdap6.info libdap8.info
Log Message:
Last upstream libnc-dap3, which requires new upstream libdap.
Clean up unused libdapN.
Index: libnc-dap3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/libnc-dap3.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- libnc-dap3.info 27 Jul 2011 19:44:14 -0000 1.22
+++ libnc-dap3.info 4 Aug 2011 15:43:17 -0000 1.23
@@ -1,6 +1,6 @@
Package: libnc-dap3
-Version: 3.7.3
-Revision: 3
+Version: 3.7.4
+Revision: 1
BuildDependsOnly: true
GCC: 4.0
Description: OPeNDAP netCDF Client Library
@@ -8,13 +8,13 @@
Maintainer: Alexander Hansen <[email protected]>
Depends: %N-shlibs (= %v-%r), pkgconfig
BuildDepends: <<
-gcc44 | gcc45 | gcc46, libdap9 (>=3.7.3-1), libiconv-dev, libcurl4, libxml2,
system-openssl-dev,
+gcc44 | gcc45 | gcc46, libdap10, libiconv-dev, libcurl4, libxml2,
system-openssl-dev,
libssh2.1, libidn, libgettext8-dev
<<
# Unpack Phase:
Source: http://opendap.org/pub/source/libnc-dap-%v.tar.gz
-Source-MD5: b69f3fb1b26b65903e41c2aa832cab34
+Source-MD5: 671bf7ad07e00ed0be6518a80792c587
PatchScript: perl -pi -e 's|ncdump|dncdump|g' ncdump/ncdump.1
# Compile Phase
@@ -43,7 +43,7 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- libdap9-shlibs (>=3.7.3-1), libcurl4-shlibs, libiconv, libssh2.1-shlibs,
+ libdap10-shlibs, libcurl4-shlibs, libiconv, libssh2.1-shlibs,
libxml2-shlibs
<<
Files: lib/libnc-dap.*.dylib
@@ -57,10 +57,16 @@
dereference OPeNDAP URLs. You can substitute our version of
the library when linking your application and then simply pass
an OPeNDAP URL in where you would normally use a file name.
+
+ The functionaliy of this package has been subsumed into the mainline
+ netCDF distribution, as represented in Fink's netcdf7 package, so this
+ is the last upstream release.
<<
DescPackaging: <<
Manually install manpage.
Rename 'ncdump' to 'dncdump' to avoid collisions with netcdf-bin
+
+Doesn't actually link to the fortran libraries from gcc4N, so allow a choice.
<<
-Homepage: http://opendap.org/download/nc-dods.html
+Homepage: http://opendap.org/netCDF-DAP
--- libdap8.info DELETED ---
--- libdap6.info DELETED ---
Index: libdap9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/libdap9.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libdap9.info 27 Oct 2009 15:09:09 -0000 1.5
+++ libdap9.info 4 Aug 2011 15:43:17 -0000 1.6
@@ -1,6 +1,6 @@
Package: libdap9
Version: 3.8.2
-Revision: 2
+Revision: 3
BuildDependsOnly: true
GCC: 4.0
Description: DAP 2.0 C++ SDK
@@ -8,8 +8,8 @@
Maintainer: Alexander Hansen <[email protected]>
Depends: %N-shlibs (= %v-%r), pkgconfig
BuildDepends: libcurl4 (>= 7.19.2-2), libxml2, libiconv-dev,
system-openssl-dev, libssh2.1
-Conflicts: libdap3, libdap6, libdap8, aplus-fsf-dev
-Replaces: libdap3, libdap6, libdap8, aplus-fsf-dev
+Conflicts: libdap10, libdap3, libdap6, libdap8, aplus-fsf-dev
+Replaces: libdap10, libdap3, libdap6, libdap8, aplus-fsf-dev
# Unpack Phase:
Source: http://www.opendap.org/pub/source/libdap-%v.tar.gz
--- NEW FILE: libdap10.info ---
Package: libdap10
Version: 3.9.3
Revision: 1
BuildDependsOnly: true
GCC: 4.0
Description: DAP 3.9.3 C++ SDK
License: LGPL
Maintainer: Alexander Hansen <[email protected]>
Depends: %N-shlibs (= %v-%r), pkgconfig
BuildDepends: <<
libcurl4 (>= 7.19.2-2), libxml2, libiconv-dev, system-openssl-dev,
libssh2.1,
fink-package-precedence, fink (>=0.24.12)
<<
Conflicts: aplus-fsf-dev, libdap9
Replaces: aplus-fsf-dev, libdap9
# Unpack Phase:
Source: http://www.opendap.org/pub/source/libdap-%v.tar.gz
Source-MD5: 597bf7aeb023186c65e1be4da868e75b
# Patch Phase:
PatchFile: %n.patch
PatchFile-MD5: 479e22eb4a63eec9235a3b1feab4cc36
PatchScript: sed -e 's,@FINKPREFIX@,%p', -e 's,@DAPVERS@,10,' %{PatchFile} |
patch -p1
# Compile Phase
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: --libdir=%p/opt/%N/lib --includedir=%p/opt/%N/include
CompileScript: <<
#!/bin/sh -ev
./configure %c
# for some reason, the allow_undefined_flag doesn't get set right by configure.
perl -pi.BAK -e 's|-single_module |-single_module -undefined dynamic_lookup |'
libtool
make
fink-package-precedence .
<<
# Install Phase:
DocFiles: COPYING COPYRIGHT_* README README.* NEWS
InstallScript: <<
make -j1 install DESTDIR=%d
<<
SplitOff: <<
Package: %N-shlibs
Files: opt/%N/lib/libdap*.*.dylib
Depends: libcurl4-shlibs (>= 7.19.2-2), libxml2-shlibs, libiconv,
libssh2.1-shlibs
Shlibs: <<
%p/opt/%N/lib/libdap.10.dylib 11.0.0 %n (>= 3.9.3-1)
%p/opt/%N/lib/libdapclient.3.dylib 4.0.0 %n (>= 3.9.3-1)
%p/opt/%N/lib/libdapserver.7.dylib 8.0.0 %n (>= 3.9.3-1)
<<
DocFiles: COPYING COPYRIGHT_* README README.* NEWS
<<
DescDetail: <<
A C++ SDK which contains an implementation of DAP 2.0,
Client- and Server-side support classes and a prototype
implementation of the AIS.
<<
DescPackaging: <<
libcurl4 uses system-openssl, so we can also use
system-openssl. By not inheriting or causing our own a
dependency on fink's openssl, we can stay out of
section:crpyto.
Patch dap-config.in and dap-config-pkgconfig so that they actually point
dependent packages to the actual include directory and lib directory,
and
.pc file, respectively.
Needed by the last version of libnc-dap3. libdap >= 3.10 breaks API
(but
kept the libversion) and libnc-dap3 won't build against it any more.
Any
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
--- libdap3.info DELETED ---
--- NEW FILE: libdap10.patch ---
diff -Naur libdap-3.10.2/dap-config-pkgconfig
libdap-3.10.2.patched/dap-config-pkgconfig
--- libdap-3.10.2/dap-config-pkgconfig 2010-05-17 14:28:40.000000000 -0400
+++ libdap-3.10.2.patched/dap-config-pkgconfig 2011-08-04 09:51:45.000000000
-0400
@@ -2,11 +2,11 @@
#
# Borrowed the idea for this script (and some code) from libcurl.
#
-
+export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@FINKPREFIX@/opt/libdap@DAPVERS@/lib/pkgconfig
usage()
{
cat <<EOF
-Usage: dap-config [OPTION]
+Usage: dap-config-pkgconfig [OPTION]
Available values for OPTION include:
diff -Naur libdap-3.10.2/dap-config.in libdap-3.10.2.patched/dap-config.in
--- libdap-3.10.2/dap-config.in 2010-05-17 14:28:40.000000000 -0400
+++ libdap-3.10.2.patched/dap-config.in 2011-08-04 09:51:38.000000000 -0400
@@ -4,8 +4,9 @@
#
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+dapdir=@FINKPREFIX@/opt/libdap@DAPVERS@
+libdir=${dapdir}/lib
+includedir=${dapdir}/include
usage()
{
------------------------------------------------------------------------------
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
