[pkgsrc/trunk]: pkgsrc/www/libproxy Apply upstream patch to fix build on OSX.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0534fbc726d7
branches:  trunk
changeset: 625809:0534fbc726d7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Oct 24 22:18:03 2013 +0000

description:
Apply upstream patch to fix build on OSX.

diffstat:

 www/libproxy/distinfo                                          |   3 +-
 www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp |  26 ++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 272e98baa4bf -r 0534fbc726d7 www/libproxy/distinfo
--- a/www/libproxy/distinfo     Thu Oct 24 21:19:12 2013 +0000
+++ b/www/libproxy/distinfo     Thu Oct 24 22:18:03 2013 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2013/05/24 18:31:49 wiz Exp $
+$NetBSD: distinfo,v 1.13 2013/10/24 22:18:03 jperkin Exp $
 
 SHA1 (libproxy-0.4.11.tar.gz) = c037969434095bc65d29437e11a7c9e0293a5149
 RMD160 (libproxy-0.4.11.tar.gz) = 382110e088faf7a170ac838864d675204d886237
 Size (libproxy-0.4.11.tar.gz) = 93757 bytes
 SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec
+SHA1 (patch-libproxy_modules_config__macosx.cpp) = 75ce7f0f6cc6df17d73ec12051621ec2ebe35ee6
diff -r 272e98baa4bf -r 0534fbc726d7 www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp    Thu Oct 24 22:18:03 2013 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-libproxy_modules_config__macosx.cpp,v 1.1 2013/10/24 22:18:03 jperkin Exp $
+
+Patch from upstream to fix OSX build.
+
+--- libproxy/modules/config_macosx.cpp.orig    2012-07-05 16:50:06.000000000 +0000
++++ libproxy/modules/config_macosx.cpp
+@@ -114,7 +114,7 @@ static string capitalize(string str) {
+ 
+ class macosx_config_extension : public config_extension {
+ public:
+-      vector<url> get_config(const url &url) throw (runtime_error) {
++      vector<url> get_config(const url &the_url) throw (runtime_error) {
+               string tmp;
+               CFDictionaryRef proxies = SCDynamicStoreCopyProxies(NULL);
+               vector<url> response;
+@@ -136,8 +136,8 @@ public:
+               }
+ 
+               // http:// or socks:// (TODO: gopher:// and rtsp:// ???)
+-              else if ((protocol_url(proxies, toupper(url.get_scheme()), tmp)    && url::is_valid(tmp)) ||
+-                  (protocol_url(proxies, capitalize(url.get_scheme()), tmp) && url::is_valid(tmp)) ||
++              else if ((protocol_url(proxies, toupper(the_url.get_scheme()), tmp)    && url::is_valid(tmp)) ||
++                  (protocol_url(proxies, capitalize(the_url.get_scheme()), tmp) && url::is_valid(tmp)) ||
+                   (protocol_url(proxies, toupper("http"), tmp)              && url::is_valid(tmp)) ||
+                   (protocol_url(proxies, toupper("socks"), tmp)             && url::is_valid(tmp))) {
+                       CFRelease(proxies);