Sun Mar 17 21:33:34 2013 UTC ()
Make "curl-config --libs" return proper ldflags for shared libraries.

After curl 7.25.0 update (imported to pkgsrc at 20120417),
"curl-config --libs" no longer returns "-Wl,-R/usr/pkg/lib"
while "curl-config --static-libs" still returns it.

Fixes the root cause of libcurl part of PR pkg/46567, and this is
also required to fix openoffice3 issue as mentioned in PR pkg/46983.
The problem is tracked and reported by Yasushi Oshima.

Bump PKGREVISION.


(tsutsui)
diff -r1.125 -r1.126 pkgsrc/www/curl/Makefile
diff -r1.83 -r1.84 pkgsrc/www/curl/distinfo
diff -r0 -r1.1 pkgsrc/www/curl/patches/patch-curl-config.in
cvs diff -r1.125 -r1.126 pkgsrc/www/curl/Makefile (expand / switch to unified diff)

--- pkgsrc/www/curl/Makefile 2013/03/10 13:21:05 1.125
+++ pkgsrc/www/curl/Makefile 2013/03/17 21:33:33 1.126
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.125 2013/03/10 13:21:05 obache Exp $ 1# $NetBSD: Makefile,v 1.126 2013/03/17 21:33:33 tsutsui Exp $
2 2
3DISTNAME= curl-7.29.0 3DISTNAME= curl-7.29.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://curl.haxx.se/download/ \ 6MASTER_SITES= http://curl.haxx.se/download/ \
7 ftp://ftp.sunet.se/pub/www/utilities/curl/ 7 ftp://ftp.sunet.se/pub/www/utilities/curl/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://curl.haxx.se/ 11HOMEPAGE= http://curl.haxx.se/
12COMMENT= Client that groks URLs 12COMMENT= Client that groks URLs
13# not completely, but near enough 13# not completely, but near enough
14LICENSE= mit 14LICENSE= mit
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17 17
cvs diff -r1.83 -r1.84 pkgsrc/www/curl/distinfo (expand / switch to unified diff)

--- pkgsrc/www/curl/distinfo 2013/03/10 13:21:05 1.83
+++ pkgsrc/www/curl/distinfo 2013/03/17 21:33:33 1.84
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.83 2013/03/10 13:21:05 obache Exp $ 1$NetBSD: distinfo,v 1.84 2013/03/17 21:33:33 tsutsui Exp $
2 2
3SHA1 (curl-7.29.0.tar.bz2) = 03eddd295d3d50d60a9dd1c130c8e110ff1aa95a 3SHA1 (curl-7.29.0.tar.bz2) = 03eddd295d3d50d60a9dd1c130c8e110ff1aa95a
4RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95 4RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95
5Size (curl-7.29.0.tar.bz2) = 2556495 bytes 5Size (curl-7.29.0.tar.bz2) = 2556495 bytes
6SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570 6SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570
 7SHA1 (patch-curl-config.in) = 406fdc1ea210e81a674b7edae9842ec9083bf45e
7SHA1 (patch-lib_multi.c) = ead077ecdb819081e7a271feb6e249a20e025f75 8SHA1 (patch-lib_multi.c) = ead077ecdb819081e7a271feb6e249a20e025f75
File Added: pkgsrc/www/curl/patches/patch-curl-config.in
$NetBSD: patch-curl-config.in,v 1.1 2013/03/17 21:33:34 tsutsui Exp $

- make "curl-config --libs" return proper ldflags for shared libraries

--- curl-config.in.orig	2012-08-08 21:38:25.000000000 +0000
+++ curl-config.in
@@ -148,9 +148,9 @@
 	   CURLLIBDIR=""
 	fi
 	if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
-	  echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
+	  echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
 	else
-	  echo ${CURLLIBDIR}-lcurl
+	  echo @LDFLAGS@ ${CURLLIBDIR}-lcurl
 	fi
 	;;