changeset 1499:9e587ca588dc

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.
author Mark Brand <mabrand@mabrand.nl>
date Sun, 12 Dec 2010 01:16:13 +0100
parents 1bb2b5a951f5
children 09e48fb4aa19
files src/boost.mk src/cppunit.mk src/dcmtk.mk src/ffmpeg.mk src/fribidi.mk src/gcc-mpfr.mk src/gmp.mk src/graphicsmagick.mk src/lapack.mk src/lcms.mk src/libcroco.mk src/libdnet.mk src/liblo.mk src/libmad.mk src/libmng.mk src/libusb.mk src/libvpx.mk src/matio.mk src/muparser.mk src/mxml.mk src/openal.mk src/opencore-amr.mk src/openscenegraph.mk src/pfstools.mk src/plotmm.mk src/sdl_pango.mk src/sqlite.mk src/taglib.mk src/vmime.mk src/xine-lib.mk src/xmlwrapp.mk src/zziplib.mk
diffstat 32 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/boost.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/boost.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/cppunit.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/cppunit.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/dcmtk.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/dcmtk.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/ffmpeg.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/ffmpeg.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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)
--- a/src/fribidi.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/fribidi.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/gcc-mpfr.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/gcc-mpfr.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,9 +7,9 @@
 $(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     :=
 
--- a/src/gmp.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/gmp.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -9,7 +9,7 @@
 $(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
 
--- a/src/graphicsmagick.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/graphicsmagick.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/lapack.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/lapack.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/lcms.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/lcms.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/libcroco.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/libcroco.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/libdnet.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/libdnet.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/liblo.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/liblo.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/libmad.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/libmad.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/libmng.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/libmng.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/libusb.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/libusb.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/libvpx.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/libvpx.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/matio.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/matio.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/muparser.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/muparser.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/mxml.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/mxml.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/openal.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/openal.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/opencore-amr.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/opencore-amr.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/openscenegraph.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/openscenegraph.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,9 +7,9 @@
 $(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
--- a/src/pfstools.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/pfstools.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/plotmm.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/plotmm.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/sdl_pango.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/sdl_pango.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/sqlite.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/sqlite.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/taglib.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/taglib.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/vmime.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/vmime.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/xine-lib.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/xine-lib.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/xmlwrapp.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/xmlwrapp.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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
--- a/src/zziplib.mk	Sat Dec 11 23:19:47 2010 +0100
+++ b/src/zziplib.mk	Sun Dec 12 01:16:13 2010 +0100
@@ -7,7 +7,7 @@
 $(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