remove $($PKG)_SUBDIR) from FILE and URL defintions

For now this means a bit of duplication, but if the remaining
references to SUBDIR can be dealt with, we should be able
to get rid of the SUBDIR defintion altogether.

32 files changed, 34 insertions, 34 deletions

diff --git a/src/boost.mk b/src/boost.mk
index 70f6cf3..b2f41dd 100644
--- a/src/boost.mk
+++ b/src/boost.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.45.0
 $(PKG)_CHECKSUM := eb7424ef99df4e38af7431e38ff9849651b8aaf5
 $(PKG)_SUBDIR   := boost_$(subst .,_,$($(PKG)_VERSION))
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2
 $(PKG)_WEBSITE  := http://www.boost.org/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/boost/boost/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib bzip2 expat
diff --git a/src/cppunit.mk b/src/cppunit.mk
index 02b1787..cc8f0fa 100644
--- a/src/cppunit.mk
+++ b/src/cppunit.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.12.1
 $(PKG)_CHECKSUM := f1ab8986af7a1ffa6760f4bacf5622924639bf4a
 $(PKG)_SUBDIR   := cppunit-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := cppunit-$($(PKG)_VERSION).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
diff --git a/src/dcmtk.mk b/src/dcmtk.mk
index 1ddfb77..982ea55 100644
--- a/src/dcmtk.mk
+++ b/src/dcmtk.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.5.4
 $(PKG)_CHECKSUM := 169056874947083e68eb941fcd53faaebc862ae5
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://dicom.offis.de/dcmtk.php.en
 $(PKG)_URL      := ftp://dicom.offis.de/pub/dicom/offis/software/$(PKG)/$(PKG)$(subst .,,$($(PKG)_VERSION))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc openssl tiff libpng libxml2 zlib
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 740c307..981444b 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.6.1
 $(PKG)_CHECKSUM := 24ada1d35fc000980090e773101e101ca45f85e5
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.ffmpeg.org/
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
diff --git a/src/fribidi.mk b/src/fribidi.mk
index 49155cc..b9a7243 100644
--- a/src/fribidi.mk
+++ b/src/fribidi.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.19.2
 $(PKG)_CHECKSUM := 3889469d96dbca3d8522231672e14cca77de4d5e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://fribidi.org/
 $(PKG)_URL      := http://fribidi.org/download/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc glib
diff --git a/src/gcc-mpfr.mk b/src/gcc-mpfr.mk
index d62080b..768374e 100644
--- a/src/gcc-mpfr.mk
+++ b/src/gcc-mpfr.mk
@@ -7,9 +7,9 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.0.0
 $(PKG)_CHECKSUM := 8ae8bc72ac26a0f17ad9f57c520264c056c64770
 $(PKG)_SUBDIR   := mpfr-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := mpfr-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.mpfr.org/
-$(PKG)_URL      := http://www.mpfr.org/$($(PKG)_SUBDIR)/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://ftp.gnu.org/gnu/mpfr/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
diff --git a/src/gmp.mk b/src/gmp.mk
index a682ed3..0ad5105 100644
--- a/src/gmp.mk
+++ b/src/gmp.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 6340edc7ceb95f9015a758c7c0d196eb0f441d49
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gmplib.org/
-$(PKG)_URL      := ftp://ftp.gmplib.org/pub/$($(PKG)_SUBDIR)/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.gmplib.org/pub/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk
index 20165de..4c6ea0b 100644
--- a/src/graphicsmagick.mk
+++ b/src/graphicsmagick.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.3.12
 $(PKG)_CHECKSUM := 6b8a414af162ad8679f2f04b10f128edc8ee3233
 $(PKG)_SUBDIR   := GraphicsMagick-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := GraphicsMagick-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.graphicsmagick.org/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc pthreads libtool zlib bzip2 jpeg jasper lcms1 libpng tiff freetype libxml2
diff --git a/src/lapack.mk b/src/lapack.mk
index 27e79ca..835463b 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.3.0
 $(PKG)_CHECKSUM := 4f0b103da52110e7f60d1d7676727103aca9785e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tgz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_WEBSITE  := http://www.netlib.org/$(PKG)/
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/lcms.mk b/src/lcms.mk
index 8ad4293..70524b4 100644
--- a/src/lcms.mk
+++ b/src/lcms.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.1
 $(PKG)_CHECKSUM := 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9
 $(PKG)_SUBDIR   := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION))
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz
 $(PKG)_WEBSITE  := http://www.littlecms.com/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc jpeg tiff zlib
diff --git a/src/libcroco.mk b/src/libcroco.mk
index 26cc54b..651810a 100644
--- a/src/libcroco.mk
+++ b/src/libcroco.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.6.2
 $(PKG)_CHECKSUM := 4b0dd540a47f2492b1ac7cd7e3ec63c2ef4c9c2a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.freespiders.org/projects/libcroco/
 $(PKG)_URL      := http://ftp.gnome.org/pub/GNOME/sources/libcroco/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc glib libxml2
diff --git a/src/libdnet.mk b/src/libdnet.mk
index 4c583e7..5ee6e09 100644
--- a/src/libdnet.mk
+++ b/src/libdnet.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.11
 $(PKG)_CHECKSUM := e2ae8c7f0ca95655ae9f77fd4a0e2235dc4716bf
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://libdnet.sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc winpcap
diff --git a/src/liblo.mk b/src/liblo.mk
index c861777..aa83ffb 100644
--- a/src/liblo.mk
+++ b/src/liblo.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.26
 $(PKG)_CHECKSUM := 21942c8f19e9829b5842cb85352f98c49dfbc823
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://liblo.sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc pthreads
diff --git a/src/libmad.mk b/src/libmad.mk
index 7ed8177..0f01aaa 100644
--- a/src/libmad.mk
+++ b/src/libmad.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.15.1b
 $(PKG)_CHECKSUM := cac19cd00e1a907f3150cc040ccc077783496d76
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.underbit.com/products/mad/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mad/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/libmng.mk b/src/libmng.mk
index da63e0e..28763a0 100644
--- a/src/libmng.mk
+++ b/src/libmng.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.0.10
 $(PKG)_CHECKSUM := c21c84b614500ae1a41c6595d5f81c596e406ca2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.libmng.com/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib jpeg lcms1
diff --git a/src/libusb.mk b/src/libusb.mk
index db7c7ed..2399f09 100644
--- a/src/libusb.mk
+++ b/src/libusb.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.2.2.0
 $(PKG)_CHECKSUM := 5049b762a97ab4dd6eb02c8b9663a7f4989645bd
 $(PKG)_SUBDIR   := $(PKG)-win32-src-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).zip
+$(PKG)_FILE     := $(PKG)-win32-src-$($(PKG)_VERSION).zip
 $(PKG)_WEBSITE  := http://libusb-win32.sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)-win32/$(PKG)-win32-releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/libvpx.mk b/src/libvpx.mk
index 37b64c7..953275b 100644
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.9.5
 $(PKG)_CHECKSUM := 223965ff16737251afb3377c0800d1f8b5f84379
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://code.google.com/p/webm/
 $(PKG)_URL      := http://webm.googlecode.com/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/matio.mk b/src/matio.mk
index 53504b3..f602389 100644
--- a/src/matio.mk
+++ b/src/matio.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.3.4
 $(PKG)_CHECKSUM := 721b9b57f2437850dd114acca1f422622e2c47e2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).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
diff --git a/src/muparser.mk b/src/muparser.mk
index 8f2dd9c..d873d07 100644
--- a/src/muparser.mk
+++ b/src/muparser.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.34
 $(PKG)_CHECKSUM := d6d834d3ba2bd3c316c9b3070369d32701703f78
 $(PKG)_SUBDIR   := $(PKG)_v$(subst .,,$($(PKG)_VERSION))
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)_v$(subst .,,$($(PKG)_VERSION)).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/Version $($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/mxml.mk b/src/mxml.mk
index 2acb3b0..e69897f 100644
--- a/src/mxml.mk
+++ b/src/mxml.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.6
 $(PKG)_CHECKSUM := df180bd2e3890c97fa8a05dd131f9285468cffe1
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.minixml.org/
 $(PKG)_URL      := http://ftp.easysw.com/pub/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc pthreads
diff --git a/src/openal.mk b/src/openal.mk
index 543c87e..922b33d 100644
--- a/src/openal.mk
+++ b/src/openal.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.12.854
 $(PKG)_CHECKSUM := 537dc5fad32d227bb5e861506018b46a21e47f26
 $(PKG)_SUBDIR   := openal-soft-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := openal-soft-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://kcat.strangesoft.net/openal.html
 $(PKG)_URL      := http://kcat.strangesoft.net/openal-releases/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/opencore-amr.mk b/src/opencore-amr.mk
index 7399985..418f7f1 100644
--- a/src/opencore-amr.mk
+++ b/src/opencore-amr.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.2
 $(PKG)_CHECKSUM := 289478d49701213255e9d63a93aae9ad472125cc
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index f93bf75..4de1abf 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -7,9 +7,9 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.8.3
 $(PKG)_CHECKSUM := 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc
 $(PKG)_SUBDIR   := OpenSceneGraph-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).zip
+$(PKG)_FILE     := OpenSceneGraph-$($(PKG)_VERSION).zip
 $(PKG)_WEBSITE  := http://www.openscenegraph.org/
-$(PKG)_URL      := http://www.openscenegraph.org/downloads/stable_releases/$($(PKG)_SUBDIR)/source/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib
 
 define $(PKG)_UPDATE
diff --git a/src/pfstools.mk b/src/pfstools.mk
index d3b3955..d5593cf 100644
--- a/src/pfstools.mk
+++ b/src/pfstools.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.8.2
 $(PKG)_CHECKSUM := 6109587b0f8e53d1d963e9e02f7298bf0d197d5d
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/plotmm.mk b/src/plotmm.mk
index 5ab4651..c652eeb 100644
--- a/src/plotmm.mk
+++ b/src/plotmm.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.2
 $(PKG)_CHECKSUM := 64da0930b7c8994d59769597917cca05df989258
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gtkmm
diff --git a/src/sdl_pango.mk b/src/sdl_pango.mk
index e8172fc..992f186 100644
--- a/src/sdl_pango.mk
+++ b/src/sdl_pango.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.2
 $(PKG)_CHECKSUM := c30f2941d476d9362850a150d29cb4a93730af68
 $(PKG)_SUBDIR   := SDL_Pango-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := SDL_Pango-$($(PKG)_VERSION).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
diff --git a/src/sqlite.mk b/src/sqlite.mk
index cabdbe8..1589e65 100644
--- a/src/sqlite.mk
+++ b/src/sqlite.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3070400
 $(PKG)_CHECKSUM := 43848641320cb60fb7f445bc295b9870cdc127be
 $(PKG)_SUBDIR   := $(PKG)-autoconf-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.sqlite.org/
 $(PKG)_URL      := http://www.sqlite.org/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
diff --git a/src/taglib.mk b/src/taglib.mk
index d8999b2..1d171ec 100644
--- a/src/taglib.mk
+++ b/src/taglib.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.6.3
 $(PKG)_CHECKSUM := ee54f10c63f236ef1c29c82e39c227a75a7e3785
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://developer.kde.org/~wheeler/taglib.html
 $(PKG)_URL      := http://developer.kde.org/~wheeler/files/src/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib
diff --git a/src/vmime.mk b/src/vmime.mk
index eaa6c68..3113f2f 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.9.1
 $(PKG)_CHECKSUM := 3e8dd8855e423db438d465777efeb523c4abb5f3
 $(PKG)_SUBDIR   := lib$(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := lib$(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://vmime.sourceforge.net/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libiconv gnutls libgsasl pthreads zlib
diff --git a/src/xine-lib.mk b/src/xine-lib.mk
index 528343b..d456def 100644
--- a/src/xine-lib.mk
+++ b/src/xine-lib.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.1.19
 $(PKG)_CHECKSUM := 5afcc28c5cf2bdaab99d951960f6587797e1e5a0
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.xine-project.org/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc faad2 ffmpeg flac fontconfig freetype libiconv libmng pthreads sdl speex theora vorbis zlib
diff --git a/src/xmlwrapp.mk b/src/xmlwrapp.mk
index 9050852..f45301c 100644
--- a/src/xmlwrapp.mk
+++ b/src/xmlwrapp.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.6.2
 $(PKG)_CHECKSUM := b3ef8bff215bbacd988790615b76379672105928
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).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
diff --git a/src/zziplib.mk b/src/zziplib.mk
index e2b0bd7..cae6181 100644
--- a/src/zziplib.mk
+++ b/src/zziplib.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.13.59
 $(PKG)_CHECKSUM := ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).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