30 files changed, 137 insertions, 137 deletions
diff --git a/src/cppunit.mk b/src/cppunit.mk
index 38511e9..02b1787 100644
--- a/src/cppunit.mk
+++ b/src/cppunit.mk
@@ -7,9 +7,9 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.12.1
 $(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)/project/cppunit/cppunit/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://apps.sourceforge.net/mediawiki/$(PKG)/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/faac.mk b/src/faac.mk
index 22af9c2..dcb023b 100644
--- a/src/faac.mk
+++ b/src/faac.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-src/$(PKG)
 $(PKG)_DEPS     := gcc faad2
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/faac/files/faac/) | \
-    $(SED) -n 's,.*faac-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/faac/files/faac-src/' | \
+    $(SED) -n 's,.*/faac-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/faad2.mk b/src/faad2.mk
index d2a283b..3cf8de3 100644
--- a/src/faad2.mk
+++ b/src/faad2.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-$
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/faac/files/faac/) | \
-    $(SED) -n 's,.*faad2-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/faac/files/faad2-src/' | \
+    $(SED) -n 's,.*faad2-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/freeglut.mk b/src/freeglut.mk
index 902277e..a855b55 100644
--- a/src/freeglut.mk
+++ b/src/freeglut.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PK
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/freeglut/files/) | \
+    wget -q -O- 'http://sourceforge.net/projects/freeglut/files/freeglut/' | \
     $(SED) -n 's,.*freeglut-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/freeimage.mk b/src/freeimage.mk
index 037ed8d..e6bb0b7 100644
--- a/src/freeimage.mk
+++ b/src/freeimage.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freeimage/Source Distrib
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/freeimage/files/) | \
-    $(SED) -n 's,.*/\([0-9][^>]*\)/FreeImage.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/freeimage/files/Source Distribution/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/ftgl.mk b/src/ftgl.mk
index 24fa2b2..2bdff56 100644
--- a/src/ftgl.mk
+++ b/src/ftgl.mk
@@ -4,18 +4,18 @@
 # ftgl
 PKG             := ftgl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.1.3-rc5
+$(PKG)_VERSION  := 2.1.3~rc5
 $(PKG)_CHECKSUM := 8508f26c84001d7bc949246affa03744fa1fd22e
-$(PKG)_SUBDIR   := $(PKG)-$(subst -,~,$($(PKG)_VERSION))
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$(subst ~,-,$($(PKG)_VERSION)).tar.bz2
 $(PKG)_WEBSITE  := http://sourceforge.net/projects/$(PKG)/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/FTGL Source/$(subst -,~,$($(PKG)_VERSION))/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/FTGL Source/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc freetype
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/ftgl/files/FTGL Source/) | \
-    $(SED) -n 's,.*ftgl-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/ftgl/files/FTGL Source/' | \
+    $(SED) -n 's,.*>\([0-9][^<]*\).*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/giflib.mk b/src/giflib.mk
index cd1bb37..382aa10 100644
--- a/src/giflib.mk
+++ b/src/giflib.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib 4.x/giflib
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/giflib/files/) | \
-    $(SED) -n 's,.*giflib-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/giflib/files/giflib 4.x/' | \
+    $(SED) -n 's,.*/giflib-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/gsoap.mk b/src/gsoap.mk
index 9f6c14c..646d0b4 100644
--- a/src/gsoap.mk
+++ b/src/gsoap.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FI
 $(PKG)_DEPS     := gcc openssl gnutls
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/gsoap2/files/) | \
-    $(SED) -n 's,.*gsoap_\([0-9][^>]*\)\.zip,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \
+    $(SED) -n 's,.*gsoap_\([0-9][^>]*\)\.zip.*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/id3lib.mk b/src/id3lib.mk
index f9e1c4c..57f6832 100644
--- a/src/id3lib.mk
+++ b/src/id3lib.mk
@@ -9,13 +9,13 @@ $(PKG)_CHECKSUM := c92c880da41d1ec0b242745a901702ae87970838
 $(PKG)_SUBDIR   := id3lib-$($(PKG)_VERSION)
 $(PKG)_FILE     := id3lib-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://id3lib.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/id3lib/id3lib/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/id3lib/files/) | \
-    $(SED) -n 's,.*id3lib-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/id3lib/files/id3lib/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/lame.mk b/src/lame.mk
index 374897d..f3a8970 100644
--- a/src/lame.mk
+++ b/src/lame.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/lame/files/lame/) | \
-    $(SED) -n 's,.*lame-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/lame/files/lame/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/lcms.mk b/src/lcms.mk
index bfd2ea5..f4b422b 100644
--- a/src/lcms.mk
+++ b/src/lcms.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,
 $(PKG)_DEPS     := gcc jpeg tiff zlib
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/lcms/files/) | \
-    $(SED) -n 's,.*lcms[0-9]*-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/lcms1.mk b/src/lcms1.mk
index 28ec841..74c097a 100644
--- a/src/lcms1.mk
+++ b/src/lcms1.mk
@@ -13,9 +13,10 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/lcms/lcms/$($(PKG)_VERSI
 $(PKG)_DEPS     := gcc jpeg tiff zlib
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/lcms/files/) | \
-    $(SED) -n 's,.*lcms-\(1\.[^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/lcms/files/lcms/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    grep '^1\.' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/libdnet.mk b/src/libdnet.mk
index 9d53c89..4c583e7 100644
--- a/src/libdnet.mk
+++ b/src/libdnet.mk
@@ -6,16 +6,16 @@ PKG             := libdnet
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.11
 $(PKG)_CHECKSUM := e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf
-$(PKG)_SUBDIR   := libdnet-$($(PKG)_VERSION)
-$(PKG)_FILE     := libdnet-$($(PKG)_VERSION).tar.gz
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_WEBSITE  := http://libdnet.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libdnet/libdnet/libdnet-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc winpcap
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/libdnet/files/) | \
-    $(SED) -n 's,.*libdnet-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/libdnet/files/libdnet/' | \
+    $(SED) -n 's,.*/libdnet-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/liblo.mk b/src/liblo.mk
index e3e4803..c861777 100644
--- a/src/liblo.mk
+++ b/src/liblo.mk
@@ -6,16 +6,16 @@ PKG             := liblo
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.26
 $(PKG)_CHECKSUM := 21942c8f19e9829b5842cb85352f98c49dfbc823
-$(PKG)_SUBDIR   := liblo-$($(PKG)_VERSION)
-$(PKG)_FILE     := liblo-$($(PKG)_VERSION).tar.gz
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_WEBSITE  := http://liblo.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/liblo/liblo/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc pthreads
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/liblo/files/) | \
-    $(SED) -n 's,.*liblo-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/liblo/files/liblo/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/libmad.mk b/src/libmad.mk
index 2e12314..7ed8177 100644
--- a/src/libmad.mk
+++ b/src/libmad.mk
@@ -6,16 +6,16 @@ PKG             := libmad
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.15.1b
 $(PKG)_CHECKSUM := cac19cd00e1a907f3150cc040ccc077783496d76
-$(PKG)_SUBDIR   := libmad-$($(PKG)_VERSION)
-$(PKG)_FILE     := libmad-$($(PKG)_VERSION).tar.gz
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_WEBSITE  := http://www.underbit.com/products/mad/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mad/libmad/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mad/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mad/files/libmad/) | \
-    $(SED) -n 's,.*libmad-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/mad/files/libmad/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/libmng.mk b/src/libmng.mk
index ef48156..da63e0e 100644
--- a/src/libmng.mk
+++ b/src/libmng.mk
@@ -6,16 +6,16 @@ PKG             := libmng
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.0.10
 $(PKG)_CHECKSUM := c21c84b614500ae1a41c6595d5f81c596e406ca2
-$(PKG)_SUBDIR   := libmng-$($(PKG)_VERSION)
-$(PKG)_FILE     := libmng-$($(PKG)_VERSION).tar.bz2
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_WEBSITE  := http://www.libmng.com/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libmng/libmng-devel/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib jpeg lcms1
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/libmng/files/) | \
-    $(SED) -n 's,.*libmng-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/libmng/files/libmng-devel/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/libusb.mk b/src/libusb.mk
index 80cea06..0bbd939 100644
--- a/src/libusb.mk
+++ b/src/libusb.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.12.2
 $(PKG)_CHECKSUM := a433ff5cf8dd24f5308491c8500a2143497b4b8f
 $(PKG)_SUBDIR   := $(PKG)-win32-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-win32-src-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_WEBSITE  := http://libusb-win32.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libusb-win32/libusb-win32-releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)-win32/$(PKG)-win32-releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/libusb-win32/files/) | \
-    $(SED) -n 's,.*libusb-win32-src-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/matio.mk b/src/matio.mk
index 715bcea..53504b3 100644
--- a/src/matio.mk
+++ b/src/matio.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.3.4
 $(PKG)_CHECKSUM := 721b9b57f2437850dd114acca1f422622e2c47e2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://sourceforge.net/projects/matio/
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://sourceforge.net/projects/$(PKG)/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/matio/files/) | \
-    $(SED) -n 's,.*matio-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/matio/files/matio/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/mingw-utils.mk b/src/mingw-utils.mk
index a987893..c38d409 100644
--- a/src/mingw-utils.mk
+++ b/src/mingw-utils.mk
@@ -13,9 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Utilities/$(
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/MinGW/Utilities/mingw-utils/) | \
-    $(SED) -n 's,.*mingw-utils-\([0-9][^>]*\)-mingw32-src\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/Utilities/mingw-utils/' | \
+    $(SED) -n 's,.*mingw-utils-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/mingwrt.mk b/src/mingwrt.mk
index cfccd28..9e0be33 100644
--- a/src/mingwrt.mk
+++ b/src/mingwrt.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.18
 $(PKG)_CHECKSUM := 0c562f3b6a89f376b9edba48ccd7388c535f8c8d
 $(PKG)_SUBDIR   := .
-$(PKG)_FILE     := mingwrt-$($(PKG)_VERSION)-mingw32-dev.tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.gz
 $(PKG)_WEBSITE  := http://mingw.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/) | \
-    $(SED) -n 's,.*mingwrt-\([0-9][^>]*\)-mingw32-dev\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/' | \
+    $(SED) -n 's,.*mingwrt-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/muparser.mk b/src/muparser.mk
index 217c7c6..8f2dd9c 100644
--- a/src/muparser.mk
+++ b/src/muparser.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.34
 $(PKG)_CHECKSUM := d6d834d3ba2bd3c316c9b3070369d32701703f78
 $(PKG)_SUBDIR   := $(PKG)_v$(subst .,,$($(PKG)_VERSION))
-$(PKG)_FILE     := $(PKG)_v$(subst .,,$($(PKG)_VERSION)).tar.gz
-$(PKG)_WEBSITE  := http://muparser.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/muparser/muparser/Version%20$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/Version $($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/muparser/files/) | \
-    $(SED) -n 's,.*muparser_v\([0-9]\)\([^>]*\)\.tar.*,\1.\2,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/muparser/files/muparser/' | \
+    $(SED) -n 's,.*Version%20\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/opencore-amr.mk b/src/opencore-amr.mk
index 8448d9f..7399985 100644
--- a/src/opencore-amr.mk
+++ b/src/opencore-amr.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.2
 $(PKG)_CHECKSUM := 289478d49701213255e9d63a93aae9ad472125cc
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://opencore-amr.sourceforge.net/
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/opencore-amr/files/opencore-amr/) | \
-    $(SED) -n 's,.*opencore-amr-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/opencore-amr/files/opencore-amr/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/pfstools.mk b/src/pfstools.mk
index 2529fe5..d3b3955 100644
--- a/src/pfstools.mk
+++ b/src/pfstools.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.8.2
 $(PKG)_CHECKSUM := 6109587b0f8e53d1d963e9e02f7298bf0d197d5d
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://pfstools.sourceforge.net/
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/pfstools/files/) | \
-    $(SED) -n 's,.*pfstools-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/pfstools/files/pfstools/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/plotmm.mk b/src/plotmm.mk
index dadd1b8..5ab4651 100644
--- a/src/plotmm.mk
+++ b/src/plotmm.mk
@@ -6,16 +6,16 @@ PKG             := plotmm
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.2
 $(PKG)_CHECKSUM := 64da0930b7c8994d59769597917cca05df989258
-$(PKG)_SUBDIR   := plotmm-$($(PKG)_VERSION)
-$(PKG)_FILE     := plotmm-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://plotmm.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/plotmm/plotmm/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gtkmm
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/plotmm/files/plotmm/) | \
-    $(SED) -n 's,.*plotmm-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/plotmm/files/plotmm/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/sdl_pango.mk b/src/sdl_pango.mk
index 6f8e2f5..e8172fc 100644
--- a/src/sdl_pango.mk
+++ b/src/sdl_pango.mk
@@ -7,15 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.2
 $(PKG)_CHECKSUM := c30f2941d476d9362850a150d29cb4a93730af68
 $(PKG)_SUBDIR   := SDL_Pango-$($(PKG)_VERSION)
-$(PKG)_FILE     := SDL_Pango-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_WEBSITE  := http://sdlpango.sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/sdlpango/SDL_Pango/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc sdl pango
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/sdlpango/files/SDL_Pango/) | \
-    $(SED) -n 's,.*SDL_Pango-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/sdlpango/files/SDL_Pango/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/tinyxml.mk b/src/tinyxml.mk
index 93ff40c..f690a6e 100644
--- a/src/tinyxml.mk
+++ b/src/tinyxml.mk
@@ -13,10 +13,9 @@ $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_V
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tinyxml/files/tinyxml/) | \
-    $(SED) -n 's,.*tinyxml_\([0-9][^>]*\)\.tar.*,\1,p' | \
-    $(SED) 's,_,.,g' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/tinyxml/files/tinyxml/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/vmime.mk b/src/vmime.mk
index 2b7f6af..eaa6c68 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -6,15 +6,15 @@ PKG             := vmime
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.9.1
 $(PKG)_CHECKSUM := 3e8dd8855e423db438d465777efeb523c4abb5f3
-$(PKG)_SUBDIR   := libvmime-$($(PKG)_VERSION)
-$(PKG)_FILE     := libvmime-$($(PKG)_VERSION).tar.bz2
+$(PKG)_SUBDIR   := lib$(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_WEBSITE  := http://vmime.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/vmime/vmime/0.9/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libiconv gnutls libgsasl pthreads zlib
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/vmime/files/) | \
-    $(SED) -n 's,.*vmime-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    wget -q -O- 'http://sourceforge.net/projects/vmime/files/vmime/' | \
+    $(SED) -n 's,.*libvmime-\([0-9][^>]*\)\.tar.*,\1,p' | \
     tail -1
 endef
 
diff --git a/src/w32api.mk b/src/w32api.mk
index 2a50ef2..51f6de8 100644
--- a/src/w32api.mk
+++ b/src/w32api.mk
@@ -4,18 +4,18 @@
 # MinGW Windows API
 PKG             := w32api
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.15-1
+$(PKG)_VERSION  := 3.15
 $(PKG)_CHECKSUM := a1f8f3767970663b3394e37919c0a4ea029473d6
 $(PKG)_SUBDIR   := .
-$(PKG)_FILE     := w32api-$($(PKG)_VERSION)-mingw32-dev.tar.lzma
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-1-mingw32-dev.tar.lzma
 $(PKG)_WEBSITE  := http://mingw.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-3.15/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/RuntimeLibrary/Win32-API/) | \
-    $(SED) -n 's,.*w32api-\([0-9][^>]*\)-mingw32-dev\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/RuntimeLibrary/Win32-API/' | \
+    $(SED) -n 's,.*w32api-\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/xmlwrapp.mk b/src/xmlwrapp.mk
index 1e80b23..9050852 100644
--- a/src/xmlwrapp.mk
+++ b/src/xmlwrapp.mk
@@ -6,16 +6,16 @@ PKG             := xmlwrapp
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.6.2
 $(PKG)_CHECKSUM := b3ef8bff215bbacd988790615b76379672105928
-$(PKG)_SUBDIR   := xmlwrapp-$($(PKG)_VERSION)
-$(PKG)_FILE     := xmlwrapp-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://sourceforge.net/projects/xmlwrapp/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/xmlwrapp/xmlwrapp/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_WEBSITE  := http://sourceforge.net/projects/$(PKG)/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libxml2 libxslt
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/xmlwrapp/files/) | \
-    $(SED) -n 's,.*xmlwrapp-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    wget -q -O- 'http://sourceforge.net/projects/xmlwrapp/files/xmlwrapp/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/zziplib.mk b/src/zziplib.mk
index 0ae4468..e2b0bd7 100644
--- a/src/zziplib.mk
+++ b/src/zziplib.mk
@@ -6,16 +6,16 @@ PKG             := zziplib
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.13.59
 $(PKG)_CHECKSUM := ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71
-$(PKG)_SUBDIR   := zziplib-$($(PKG)_VERSION)
-$(PKG)_FILE     := zziplib-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://zziplib.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/zziplib/zziplib$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib
 
 define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/zziplib/files/) | \
+    wget -q -O- 'http://sourceforge.net/projects/zziplib/files/' | \
     $(SED) -n 's,.*zziplib-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    tail -1
+    head -1
 endef
 
 define $(PKG)_BUILD