From ad09fd28ae898bbdc0b43525368086e2d521eeac Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Wed, 2 Sep 2009 00:55:53 +0200
Subject: improved download URLs for all SourceForge packages to ensure that
 the selected SOURCEFORGE_MIRROR is really used

---
 src/binutils.mk    | 4 ++--
 src/cppunit.mk     | 2 +-
 src/expat.mk       | 2 +-
 src/freetype.mk    | 2 +-
 src/gcc-core.mk    | 2 +-
 src/gcc-fortran.mk | 2 +-
 src/gcc-g++.mk     | 2 +-
 src/gcc-gmp.mk     | 2 +-
 src/gcc-mpfr.mk    | 2 +-
 src/gcc-objc.mk    | 2 +-
 src/gcc.mk         | 2 +-
 src/giflib.mk      | 2 +-
 src/glew.mk        | 2 +-
 src/libdnet.mk     | 2 +-
 src/libpng.mk      | 2 +-
 src/libusb.mk      | 2 +-
 src/mingwrt.mk     | 8 ++++----
 src/nsis.mk        | 2 +-
 src/pcre.mk        | 2 +-
 src/pdcurses.mk    | 2 +-
 src/w32api.mk      | 8 ++++----
 src/wxwidgets.mk   | 2 +-
 src/xmlwrapp.mk    | 2 +-
 src/zlib.mk        | 2 +-
 24 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/binutils.mk b/src/binutils.mk
index a26ba67..7ade778 100644
--- a/src/binutils.mk
+++ b/src/binutils.mk
@@ -26,11 +26,11 @@ $(PKG)_CHECKSUM := 7e930435c47991c4070b1c74b010350e4669011f
 $(PKG)_SUBDIR   := binutils-$(firstword $(subst -, ,$($(PKG)_VERSION)))
 $(PKG)_FILE     := binutils-$($(PKG)_VERSION)-src.tar.gz
 $(PKG)_WEBSITE  := http://mingw.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/mingw/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/GNU Binutils/Current Release_ GNU binutils-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := mingwrt w32api
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/GNU%20Binutils/) | \
+    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/GNU Binutils/) | \
     $(SED) -n 's,.*binutils-\([0-9][^>]*\)-src\.tar.*,\1,p' | \
     tail -1
 endef
diff --git a/src/cppunit.mk b/src/cppunit.mk
index abda278..0948226 100644
--- a/src/cppunit.mk
+++ b/src/cppunit.mk
@@ -27,7 +27,7 @@ $(PKG)_CHECKSUM := f1ab8986af7a1ffa6760f4bacf5622924639bf4a
 $(PKG)_SUBDIR   := cppunit-$($(PKG)_VERSION)
 $(PKG)_FILE     := cppunit-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://apps.sourceforge.net/mediawiki/cppunit/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/cppunit/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/cppunit/cppunit/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/expat.mk b/src/expat.mk
index e9572f3..b7b913a 100644
--- a/src/expat.mk
+++ b/src/expat.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 663548c37b996082db1f2f2c32af060d7aa15c2d
 $(PKG)_SUBDIR   := expat-$($(PKG)_VERSION)
 $(PKG)_FILE     := expat-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://expat.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/expat/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/freetype.mk b/src/freetype.mk
index d2c0520..2d4d5c7 100644
--- a/src/freetype.mk
+++ b/src/freetype.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := db08969cb5053879ff9e973fe6dd2c52c7ea2d4e
 $(PKG)_SUBDIR   := freetype-$($(PKG)_VERSION)
 $(PKG)_FILE     := freetype-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://freetype.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/freetype/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-core.mk b/src/gcc-core.mk
index e48770d..ef603f5 100644
--- a/src/gcc-core.mk
+++ b/src/gcc-core.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 7e18b5f49b77a78e0ccd31c82c6220c5756da754
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-core-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla%20Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-fortran.mk b/src/gcc-fortran.mk
index cbd0d0d..eb83ffa 100644
--- a/src/gcc-fortran.mk
+++ b/src/gcc-fortran.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 65f729704eecffbcb115a3258c17919665066214
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-fortran-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla%20Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-g++.mk b/src/gcc-g++.mk
index 15fcb2c..b2b5f28 100644
--- a/src/gcc-g++.mk
+++ b/src/gcc-g++.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 921c8c18287cabc4c515b4a52c70e445160bd161
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-g++-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla%20Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-gmp.mk b/src/gcc-gmp.mk
index e52772f..17e1609 100644
--- a/src/gcc-gmp.mk
+++ b/src/gcc-gmp.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 86dbd8a6b2fbb4c75760a80009227c9a11b801a9
 $(PKG)_SUBDIR   := gmp-$($(PKG)_VERSION)
 $(PKG)_FILE     := gmp-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gmplib.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla%20Sources/gmp-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/gmp-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-mpfr.mk b/src/gcc-mpfr.mk
index 258d478..939a0e2 100644
--- a/src/gcc-mpfr.mk
+++ b/src/gcc-mpfr.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 1f965793526cafefb30cda64cebf3712cb75b488
 $(PKG)_SUBDIR   := mpfr-$($(PKG)_VERSION)
 $(PKG)_FILE     := mpfr-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.mpfr.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla%20Sources/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-objc.mk b/src/gcc-objc.mk
index 018cda4..722bf11 100644
--- a/src/gcc-objc.mk
+++ b/src/gcc-objc.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := f99d03177548c94184a8788c1d6eefecbd4b99bc
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-objc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla%20Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/Vanilla Sources/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/gcc.mk b/src/gcc.mk
index d574d4c..c9d77ba 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 2ea56a81128f16a1076307a722373cfc0f1e6465
 $(PKG)_SUBDIR   := .
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION)-srcbase.zip
 $(PKG)_WEBSITE  := http://www.tdragon.net/recentgcc/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/TDM%20Sources/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/TDM Sources/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := pkg_config mingwrt w32api binutils gcc-gmp gcc-mpfr gcc-core gcc-g++ gcc-objc gcc-fortran
 
 define $(PKG)_UPDATE
diff --git a/src/giflib.mk b/src/giflib.mk
index 6a22628..63bc4e5 100644
--- a/src/giflib.mk
+++ b/src/giflib.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 22680f604ec92065f04caf00b1c180ba74fb8562
 $(PKG)_SUBDIR   := giflib-$($(PKG)_VERSION)
 $(PKG)_FILE     := giflib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://sourceforge.net/projects/libungif/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/giflib/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib 4.x/giflib-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/glew.mk b/src/glew.mk
index f4eadc4..22be927 100644
--- a/src/glew.mk
+++ b/src/glew.mk
@@ -27,7 +27,7 @@ $(PKG)_CHECKSUM := a94113169d46487ccda1bb2fde68fa1803bdf009
 $(PKG)_SUBDIR   := glew
 $(PKG)_FILE     := glew-$($(PKG)_VERSION)-src.tgz
 $(PKG)_WEBSITE  := http://glew.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/glew/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/glew/glew/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/libdnet.mk b/src/libdnet.mk
index b451bc9..11d1179 100644
--- a/src/libdnet.mk
+++ b/src/libdnet.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf
 $(PKG)_SUBDIR   := libdnet-$($(PKG)_VERSION)
 $(PKG)_FILE     := libdnet-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://libdnet.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/libdnet/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libdnet/libdnet/libdnet-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc winpcap
 
 define $(PKG)_UPDATE
diff --git a/src/libpng.mk b/src/libpng.mk
index fe1099d..2a68438 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 09749931ab6bdef7d392efd76813406a95708432
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.libpng.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/libpng/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng-master/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib
 
 define $(PKG)_UPDATE
diff --git a/src/libusb.mk b/src/libusb.mk
index dd2f33a..73c0f70 100644
--- a/src/libusb.mk
+++ b/src/libusb.mk
@@ -27,7 +27,7 @@ $(PKG)_CHECKSUM := a433ff5cf8dd24f5308491c8500a2143497b4b8f
 $(PKG)_SUBDIR   := $(PKG)-win32-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-win32-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://libusb-win32.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/libusb-win32/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libusb-win32/libusb-win32-releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/mingwrt.mk b/src/mingwrt.mk
index 254ab76..1a3e59a 100644
--- a/src/mingwrt.mk
+++ b/src/mingwrt.mk
@@ -21,17 +21,17 @@
 
 # MinGW Runtime
 PKG             := mingwrt
-$(PKG)_VERSION  := 3.15.2-mingw32
+$(PKG)_VERSION  := 3.15.2
 $(PKG)_CHECKSUM := 9f562408b94202ecff558e683e5d7df5440612c4
 $(PKG)_SUBDIR   := .
-$(PKG)_FILE     := mingwrt-$($(PKG)_VERSION)-dev.tar.gz
+$(PKG)_FILE     := mingwrt-$($(PKG)_VERSION)-mingw32-dev.tar.gz
 $(PKG)_WEBSITE  := http://mingw.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/mingw/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW Runtime/mingwrt-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
     $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/MinGW Runtime/) | \
-    $(SED) -n 's,.*mingwrt-\([0-9][^>]*\)-dev\.tar.*,\1,p' | \
+    $(SED) -n 's,.*mingwrt-\([0-9][^>]*\)-mingw32-dev\.tar.*,\1,p' | \
     tail -1
 endef
 
diff --git a/src/nsis.mk b/src/nsis.mk
index a54c773..a20ab93 100644
--- a/src/nsis.mk
+++ b/src/nsis.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := ce02adf68dbedc798615ffb212d27a9b03d5defb
 $(PKG)_SUBDIR   := nsis-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := nsis-$($(PKG)_VERSION)-src.tar.bz2
 $(PKG)_WEBSITE  := http://nsis.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/nsis/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/pcre.mk b/src/pcre.mk
index 67769a4..19e77fc 100644
--- a/src/pcre.mk
+++ b/src/pcre.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := a4a34f71313ac042455355c01ad851791971a7fa
 $(PKG)_SUBDIR   := pcre-$($(PKG)_VERSION)
 $(PKG)_FILE     := pcre-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.pcre.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/pcre/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/pdcurses.mk b/src/pdcurses.mk
index dfc3648..8f7cb10 100644
--- a/src/pdcurses.mk
+++ b/src/pdcurses.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := e36684442a6171cc3a5165c8c49c70f67db7288c
 $(PKG)_SUBDIR   := PDCurses-$($(PKG)_VERSION)
 $(PKG)_FILE     := PDCurses-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://pdcurses.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/pdcurses/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/pdcurses/pdcurses/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/w32api.mk b/src/w32api.mk
index e5fcdb4..353730d 100644
--- a/src/w32api.mk
+++ b/src/w32api.mk
@@ -21,17 +21,17 @@
 
 # MinGW Windows API
 PKG             := w32api
-$(PKG)_VERSION  := 3.13-mingw32
+$(PKG)_VERSION  := 3.13
 $(PKG)_CHECKSUM := 5eb7d8ec0fe032a92bea3a2c8282a78df2f1793c
 $(PKG)_SUBDIR   := .
-$(PKG)_FILE     := w32api-$($(PKG)_VERSION)-dev.tar.gz
+$(PKG)_FILE     := w32api-$($(PKG)_VERSION)-mingw32-dev.tar.gz
 $(PKG)_WEBSITE  := http://mingw.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/mingw/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW API for MS-Windows/Current Release_ w32api-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
     $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/MinGW API for MS-Windows/) | \
-    $(SED) -n 's,.*w32api-\([0-9][^>]*\)-src\.tar.*,\1,p' | \
+    $(SED) -n 's,.*w32api-\([0-9][^>]*\)-mingw32-dev\.tar.*,\1,p' | \
     tail -1
 endef
 
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk
index 903252a..1791d8f 100644
--- a/src/wxwidgets.mk
+++ b/src/wxwidgets.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := e674086391ce5c8e64ef1823654d6f88b064c8e0
 $(PKG)_SUBDIR   := wxMSW-$($(PKG)_VERSION)
 $(PKG)_FILE     := wxMSW-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.wxwidgets.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/wxwindows/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/wxMSW/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libiconv libpng jpeg tiff sdl tre zlib expat
 
 define $(PKG)_UPDATE
diff --git a/src/xmlwrapp.mk b/src/xmlwrapp.mk
index e50b502..d22fff8 100644
--- a/src/xmlwrapp.mk
+++ b/src/xmlwrapp.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := af96d589bd13737080cd02620685c665f9807397
 $(PKG)_SUBDIR   := xmlwrapp-$($(PKG)_VERSION)
 $(PKG)_FILE     := xmlwrapp-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://sourceforge.net/projects/xmlwrapp/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/xmlwrapp/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/xmlwrapp/xmlwrapp/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libxml2 libxslt
 
 define $(PKG)_UPDATE
diff --git a/src/zlib.mk b/src/zlib.mk
index eed9baf..f85182a 100644
--- a/src/zlib.mk
+++ b/src/zlib.mk
@@ -26,7 +26,7 @@ $(PKG)_CHECKSUM := 967e280f284d02284b0cd8872a8e2e04bfdc7283
 $(PKG)_SUBDIR   := zlib-$($(PKG)_VERSION)
 $(PKG)_FILE     := zlib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.zlib.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/libpng/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libpng/zlib/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-- 
cgit v0.12