summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/libproxy/Makefile8
-rw-r--r--www/libproxy/distinfo11
-rw-r--r--www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp26
3 files changed, 9 insertions, 36 deletions
diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile
index 2e7f2151725..32d248b2a8c 100644
--- a/www/libproxy/Makefile
+++ b/www/libproxy/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2015/04/27 11:03:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2016/01/19 10:51:16 leot Exp $
-DISTNAME= libproxy-0.4.11
+DISTNAME= libproxy-0.4.12
CATEGORIES= www gnome
-MASTER_SITES= http://libproxy.googlecode.com/files/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://code.google.com/p/libproxy/
+HOMEPAGE= http://libproxy.github.io/libproxy/
COMMENT= Library that provides automatic proxy configuration management
LICENSE= gnu-lgpl-v2.1
diff --git a/www/libproxy/distinfo b/www/libproxy/distinfo
index 54a849af1bc..3ae2cd9a915 100644
--- a/www/libproxy/distinfo
+++ b/www/libproxy/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 02:46:56 agc Exp $
+$NetBSD: distinfo,v 1.17 2016/01/19 10:51:16 leot Exp $
-SHA1 (libproxy-0.4.11.tar.gz) = c037969434095bc65d29437e11a7c9e0293a5149
-RMD160 (libproxy-0.4.11.tar.gz) = 382110e088faf7a170ac838864d675204d886237
-SHA512 (libproxy-0.4.11.tar.gz) = 563a837946a73c41e0773cec93332c6308245c0b807a40a0fb052c2445deae4a117ba2780a350c799717fd11c4dbe410183a38ea050a4f04db0b1adcb6f9ad98
-Size (libproxy-0.4.11.tar.gz) = 93757 bytes
+SHA1 (libproxy-0.4.12.tar.gz) = f11a86858ab02819eefb55de50d9175c23829a06
+RMD160 (libproxy-0.4.12.tar.gz) = 6e00899b4c52abe0319d62eceec36cad52c0e7e5
+SHA512 (libproxy-0.4.12.tar.gz) = dc9b79f0674681db39c6cfcc6c92112df4f1efdd2eb0750e30e3a2acea7015cafe1fc45e54ae371c95cd639ac86329a1a4c118856f5e18662e933dc5744683f6
+Size (libproxy-0.4.12.tar.gz) = 87765 bytes
SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec
-SHA1 (patch-libproxy_modules_config__macosx.cpp) = 75ce7f0f6cc6df17d73ec12051621ec2ebe35ee6
diff --git a/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp b/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp
deleted file mode 100644
index fa075b48653..00000000000
--- a/www/libproxy/patches/patch-libproxy_modules_config__macosx.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$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);