From 86ea3b3e5fcad534dbb1e0ca2b7c25742bbe2e3c Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 26 Jul 2015 20:32:17 -0400
Subject: Fix downloading json_spirit,liboauth, and netcdf

See #774.
---
 src/json_spirit.mk | 2 +-
 src/liboauth.mk    | 4 ++--
 src/netcdf.mk      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/json_spirit.mk b/src/json_spirit.mk
index 798a06f..1f7cc40 100644
--- a/src/json_spirit.mk
+++ b/src/json_spirit.mk
@@ -11,7 +11,7 @@ $(PKG)_FILE     := $(PKG)_v$($(PKG)_VERSION).zip
 # The original source of this file at
 # http://www.codeproject.com/KB/recipes/JSON_Spirit/json_spirit_v4.08.zip
 # is behind a login screen. Use manually downloaded cache on the S3 bucket.
-$(PKG)_URL       = $(PKG_MIRROR)/$(shell $(call ESCAPE_PKG,json_spirit))
+$(PKG)_URL       = $(PKG_MIRROR)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc boost
 
 define $(PKG)_UPDATE
diff --git a/src/liboauth.mk b/src/liboauth.mk
index 87bb9a6..6e50c93 100644
--- a/src/liboauth.mk
+++ b/src/liboauth.mk
@@ -7,11 +7,11 @@ $(PKG)_VERSION  := 1.0.3
 $(PKG)_CHECKSUM := 791dbb4166b5d2c843c8ff48ac17284cc0884af2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://liboauth.sourceforge.net/pool/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc curl openssl
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://liboauth.sourceforge.net/' | \
+    $(WGET) -q -O- 'http://sourceforge.net/projects/liboauth/files/' | \
     $(SED) -n 's,.*liboauth-\([0-9][^>]*\)\.tar.*,\1,p' | \
     head -1
 endef
diff --git a/src/netcdf.mk b/src/netcdf.mk
index 360206c..5099978 100644
--- a/src/netcdf.mk
+++ b/src/netcdf.mk
@@ -7,7 +7,7 @@ $(PKG)_VERSION  := 4.3.0
 $(PKG)_CHECKSUM := 246e4963e66e1c175563cc9a714e9da0a19b8b07
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.unidata.ucar.edu/downloads/netcdf/ftp/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.unidata.ucar.edu/pub/netcdf/old/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc curl hdf4 hdf5 portablexdr zlib
 
 define $(PKG)_UPDATE
-- 
cgit v0.12