Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31407
Modified Files:
libcurl3-unified.info
Added Files:
libcurl3-unified.patch
Log Message:
Cleaned up building, enabled (I think) LDAP, added openssl linking hints to
DescPackaging, moved patching to patch file.
--- NEW FILE: libcurl3-unified.patch ---
diff -ru curl-7.15.1.orig/curl-config.in curl-7.15.1/curl-config.in
--- curl-7.15.1.orig/curl-config.in 2005-09-04 14:15:24.000000000 -0400
+++ curl-7.15.1/curl-config.in 2005-12-22 16:34:46.000000000 -0500
@@ -143,7 +143,7 @@
;;
--libs)
- echo [EMAIL PROTECTED]@ -lcurl @LDFLAGS@ @LIBS@
+ echo @LDFLAGS@ [EMAIL PROTECTED]@ -lcurl @LIBS@
;;
*)
diff -ru curl-7.15.1.orig/libcurl.pc.in curl-7.15.1/libcurl.pc.in
--- curl-7.15.1.orig/libcurl.pc.in 2005-12-22 16:31:06.000000000 -0500
+++ curl-7.15.1/libcurl.pc.in 2005-12-22 16:34:20.000000000 -0500
@@ -6,5 +6,5 @@
Name: libcurl
Description: Library to transfer files with ftp, http, etc.
Version: @VERSION@
-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+Libs: @LDFLAGS@ -L${libdir} -lcurl @LIBS@
Cflags: -I${includedir}
Index: libcurl3-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/libcurl3-unified.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libcurl3-unified.info 8 Dec 2005 01:29:07 -0000 1.5
+++ libcurl3-unified.info 22 Dec 2005 21:53:27 -0000 1.6
@@ -1,10 +1,15 @@
Package: libcurl3-unified
Version: 7.15.1
-Revision: 1
+Revision: 2
Description: Lib. for transferring files with URL syntax
DescPackaging: <<
Now use System's OpenSSL.
+ Packages that also use the system's OpenSSL and link to this
+ 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
+
Versions of curl before 7.11.1-11 were maintained by Max Horn.
<<
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
@@ -20,14 +25,11 @@
Replaces: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3 (<< %n-%r),
libcurl3-ssl (<< %n-%r)
BuildDependsOnly: True
-PatchScript: <<
- perl -pi.bak -e's,(Libs:) (-L\$\{libdir\}),$1 -L%p/lib/system-openssl/lib
$2,' libcurl.pc.in
- perl -pi.bak -e's,(echo) ([EMAIL PROTECTED]@),$1 -L%p/lib/system-openssl/lib
$2,' curl-config.in
-<<
+Patch: %n.patch
-SetCPPFLAGS: -I%p/lib/system-openssl/include
-SetLDFLAGS: -no-undefined -L%p/lib/system-openssl/lib
-ConfigureParams: --mandir=%p/share/man --with-ssl=%p/lib/system-openssl
--without-gnutls --without-libidn --disable-dependency-tracking
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
+ConfigureParams: --mandir=%p/share/man --with-ssl=%p/lib/system-openssl
--without-gnutls --without-libidn --disable-dependency-tracking
--with-ldap-lib=/usr/lib/libldap.dylib --with-lber-lib=/usr/lib/liblber.dylib
InstallScript: <<
make install DESTDIR=%d
/bin/mkdir -p %I/share/doc/%N
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
