Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv21520

Modified Files:
        libcurl4.info libssh2.info 
Added Files:
        libssh2.1.info 
Log Message:
Update libcurl4 to use libssh2.1

Index: libssh2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/libssh2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libssh2.info        17 Dec 2006 17:59:07 -0000      1.1
+++ libssh2.info        26 Jun 2007 23:56:00 -0000      1.2
@@ -1,6 +1,6 @@
 Package: libssh2
 Version: 0.14
-Revision: 1
+Revision: 2
 Description: Library implementing the SSH2 protocol
 Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
 Homepage: http://www.libssh2.org
@@ -12,7 +12,6 @@
   
   Patched and manually installed to do proper versioning.
   Newer versions will use libtool and won't need this hackery.
-  Patched libssh2_config.h.in to disable poll and use select.
 <<
 
 Source: mirror:sourceforge:libssh2/libssh2-%v.tar.gz
@@ -21,10 +20,11 @@
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: system-openssl-dev
 BuildDependsOnly: true
+Conflicts: libssh2.1
+Replaces: libssh2.1
 
 PatchScript: <<
   perl -pi.bak -e's,-flat_namespace,-install_name %p/lib/libssh2.0.dylib 
-current_version 1.0.0 -compatibility_version 1.0.0,' configure
-  perl -pi.bak -e's,#undef HAVE_POLL,/* $& */,' include/libssh2_config.h.in
 <<
 
 NoSetCPPFLAGS: true

--- NEW FILE: libssh2.1.info ---
Package: libssh2.1
Version: 0.15
Revision: 1
Description: Library implementing the SSH2 protocol
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Homepage: http://www.libssh2.org
License: BSD
DescPackaging: <<
  The actual name of this library is libssh2; the "2" has
  nothing to do with the version number. The major version
  number is actually 1.
<<

Source: mirror:sourceforge:libssh2/libssh2-%v.tar.gz
Source-MD5: 6c641d6dc0d0e546249cad1d16f10a6a

Depends: %N-shlibs (= %v-%r)
BuildDepends: system-openssl-dev
BuildDependsOnly: true
Conflicts: libssh2
Replaces: libssh2

NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --with-openssl=%p/lib/system-openssl --with-libz=/usr 
--disable-dependency-tracking

InstallScript: <<
  make install DESTDIR=%d
<<

DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README

SplitOff: <<
  Package: %N-shlibs
  
  Files: lib/libssh2.1.0.0.dylib lib/libssh2.1.dylib
  Shlibs: %p/lib/libssh2.1.dylib 2.0.0 %n (>= 0.14.99-1)
  DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README
<<

InfoTest: <<
  TestScript: make check || exit 2
<<
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- libcurl4.info       25 Jun 2007 20:44:48 -0000      1.12
+++ libcurl4.info       26 Jun 2007 23:56:00 -0000      1.13
@@ -1,6 +1,6 @@
 Package: libcurl4
 Version: 7.16.3
-Revision: 1
+Revision: 2
 Description: Lib. for transferring files with URL syntax
 DescPackaging: <<
   Now use System's OpenSSL.
@@ -9,9 +9,9 @@
   should be careful to link to the proper libssl and libcrypto.
   Either make sure -L%p/lib/system-openssl/lib comes before -L%p/lib
   when linking, or use a BuildConflicts: openssl-dev, openssl097-dev
-  Now links to libssh2. Packages that BuildDepend on libcurl4 might
-  need to also BuildDepend on system-openssl-dev and libssh2 if they
-  link to -lss -lcrypt -lssh2.
+  Now links to libssh2.1. Packages that BuildDepend on libcurl4 might
+  need to also BuildDepend on system-openssl-dev and libssh2.1 if they
+  link to -lssl -lcrypto -lssh2.
   
   No longer need --mandir. Private symbols now hidden with gcc 4.
   Depend on pkgconfig >= 0.20-1
@@ -27,7 +27,7 @@
 Source-MD5: ed55dfa8946ad53f245fae5db3a9d0ca
 
 Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
-BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2
+BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2.1
 Conflicts: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl, 
libcurl3-unified
 Replaces: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl, 
libcurl3-unified
 BuildDependsOnly: True
@@ -52,7 +52,7 @@
 SplitOff: <<
   Package: %N-shlibs
   
-  Depends: libssh2-shlibs
+  Depends: libssh2.1-shlibs
     
   Files: lib/libcurl.4.0.0.dylib lib/libcurl.4.dylib
   Shlibs: %p/lib/libcurl.4.dylib 5.0.0 %n (>= 7.16.0-1)


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

Reply via email to