From 54f7010ad312515468fee1b9cac29cecdf63abad Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@pkgsrc.org>
Date: Sun, 17 Mar 2013 21:33:33 +0000
Subject: 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.
---
 www/curl/Makefile                     |  4 ++--
 www/curl/distinfo                     |  3 ++-
 www/curl/patches/patch-curl-config.in | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 www/curl/patches/patch-curl-config.in

(limited to 'www')

diff --git a/www/curl/Makefile b/www/curl/Makefile
index d34a9a27626..bb1ce61242e 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.125 2013/03/10 13:21:05 obache Exp $
+# $NetBSD: Makefile,v 1.126 2013/03/17 21:33:33 tsutsui Exp $
 
 DISTNAME=	curl-7.29.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 0fc006e126c..d40e1acdadc 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.83 2013/03/10 13:21:05 obache Exp $
+$NetBSD: distinfo,v 1.84 2013/03/17 21:33:33 tsutsui Exp $
 
 SHA1 (curl-7.29.0.tar.bz2) = 03eddd295d3d50d60a9dd1c130c8e110ff1aa95a
 RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95
 Size (curl-7.29.0.tar.bz2) = 2556495 bytes
 SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570
+SHA1 (patch-curl-config.in) = 406fdc1ea210e81a674b7edae9842ec9083bf45e
 SHA1 (patch-lib_multi.c) = ead077ecdb819081e7a271feb6e249a20e025f75
diff --git a/www/curl/patches/patch-curl-config.in b/www/curl/patches/patch-curl-config.in
new file mode 100644
index 00000000000..a0c5e4f122e
--- /dev/null
+++ b/www/curl/patches/patch-curl-config.in
@@ -0,0 +1,18 @@
+$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
+ 	;;
+ 
-- 
cgit v1.2.3