head	1.2;
access;
symbols
	pkgsrc-2015Q4:1.1.0.18
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.16
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.14
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.12
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.10
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.8
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.6
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.4
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2016.01.19.10.51.16;	author leot;	state dead;
branches;
next	1.1;
commitid	y6bfpNv9HNHlYwRy;

1.1
date	2013.10.24.22.18.03;	author jperkin;	state Exp;
branches;
next	;
commitid	SL3JOXycodoB2Bax;


desc
@@


1.2
log
@Update www/libproxy to 0.4.12.

pkgsrc changes:
 o Update MASTER_SITES and HOMEPAGE (libproxy migrated to GitHub)
 o Delete patches/patch-libproxy_modules_config__macosx.cpp, now present in the
   stable release.

Changes:
New in version 0.4.12
==============================
* Move development to github.com/libproxy/libproxy
* Fix fd leak in get_pac (Bug #185)
* Detect running MATE session (Bug #186, Part1).
* Fix linking of perl bindings to pthread (Bug #182)
* Correctly detect spidermonky (mozjs185) (Bug #188)
* Stop pxgsettings from segfaulting on exit (Bug #192)
* Fix test #10 (Bug #189)
* Fix build on Mac OS X (Bug #183)
* Add a generic KDE Config module (fix crashes of Qt5 based
  apps) (issue#4)
@
text
@$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);
@


1.1
log
@Apply upstream patch to fix build on OSX.
@
text
@d1 1
a1 1
$NetBSD$
@