changeset 1519:c7fd27f6874e

merge
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 19 Dec 2010 11:28:39 +0100
parents 1e071bb32b42 (current diff) 223dfd0660bc (diff)
children 22c024a165c1
files Makefile
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Dec 18 11:24:49 2010 +0100
+++ b/Makefile	Sun Dec 19 11:28:39 2010 +0100
@@ -59,7 +59,7 @@
 DOWNLOAD_PKG_ARCHIVE = \
     mkdir -p '$(PKG_DIR)' && \
     $(if $($(1)_URL_2), \
-        ( wget -T 30 -O- '$($(1)_URL)' || wget -O- '$($(1)_URL_2)' ), \
+        ( wget -T 30 -t 3 -O- '$($(1)_URL)' || wget -O- '$($(1)_URL_2)' ), \
         wget -O- '$($(1)_URL)') \
     $(if $($(1)_FIX_GZIP), \
         | gzip -d | gzip -9n, \
--- a/src/openscenegraph.mk	Sat Dec 18 11:24:49 2010 +0100
+++ b/src/openscenegraph.mk	Sun Dec 19 11:28:39 2010 +0100
@@ -10,6 +10,7 @@
 $(PKG)_FILE     := OpenSceneGraph-$($(PKG)_VERSION).zip
 $(PKG)_WEBSITE  := http://www.openscenegraph.org/
 $(PKG)_URL      := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://distfiles.macports.org/OpenSceneGraph/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib
 
 define $(PKG)_UPDATE