-LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
-LIBDVDPLAY_VERSION=1.0.1
-LIBDVDPLAY_URL=http://download.videolan.org/pub/libdvdplay/$(LIBDVDPLAY_VERSION)/libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
-LIBDVBPSI_VERSION=0.1.4
-LIBDVBPSI_URL=http://download.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
-LIVEDOTCOM_VERSION=2003.11.06
-LIVEDOTCOM_URL=http://download.videolan.org/pub/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
-GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz
-LIBCACA_VERSION=0.6
-LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
-
-
+LIBDVDREAD_URL=http://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
+LIBDVDNAV_VERSION=0.1.10
+LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+LIBDVBPSI_VERSION=0.1.5
+LIBDVBPSI_URL=$(VIDEOLAN)/contrib/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+LIVEDOTCOM_VERSION=latest
+LIVEDOTCOM_URL=http://www.live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
+#GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
+GOOM2k4_VERSION=2k4-0
+GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
+LIBCACA_VERSION=0.9
+LIBCACA_URL=http://sam.zoy.org/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
+LIBDTS_VERSION=0.0.2
+LIBDTS_URL=$(VIDEOLAN)/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
+MODPLUG_VERSION=0.7
+MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
+MASH_VERSION=5.2
+MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
+CDDB_VERSION=0.9.6
+CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
+VCDIMAGER_VERSION=0.7.21
+VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
+CDIO_VERSION=0.72
+CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
+PNG_VERSION=1.2.5
+PNG_URL=$(VIDEOLAN)/testing/contrib/libpng-$(PNG_VERSION).tar.bz2
+GPGERROR_VERSION=1.0
+GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
+GCRYPT_VERSION=1.2.0
+GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.gz
+GNUTLS_VERSION=1.2.6
+GNUTLS_URL=ftp://ftp.gnutls.org/pub/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
+DAAP_VERSION=0.4.0
+DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
+GLIB_VERSION=1.2.8
+GLIB_URL=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.8.tar.gz
+LIBIDL_VERSION=0.6.8
+LIBIDL_URL=http://andrewtv.org/libIDL/libIDL-$(LIBIDL_VERSION).tar.gz
+GECKO_SDK_MAC_URL=$(VIDEOLAN)/testing/contrib/gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
+MOZILLA_VERSION=1.7.5
+MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
+TWOLAME_VERSION=0.3.2
+TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
+X264_VERSION=20050609
+X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz
+JPEG_VERSION=6b
+JPEG_URL=$(VIDEOLAN)/contrib/jpeg-$(JPEG_VERSION).tar.gz
+TIFF_VERSION=v3.4
+TIFF_URL=ftp://ftp.sgi.com/graphics/tiff/tiff-$(TIFF_VERSION)-tar.gz
+SDL_VERSION=1.2.8
+SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
+SDL_IMAGE_VERSION=1.2.4
+SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+MUSE_VERSION=1.2.1
+MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2