3 files changed, 26 insertions, 14 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index b28c20051103..187769094365 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -8,18 +8,17 @@
 PORTNAME=	win32-codecs
 PORTVERSION=	${CODEC_VERSION}.0.${CODEC_MPLAYER_VERSION}
 CATEGORIES=	graphics audio
-MASTER_SITES=	http://avifile.sourceforge.net/ \
-		http://www.toon.eu.org/divx/ \
+MASTER_SITES=	http://avifile.sourceforge.net/:binaries \
 		http://ernie.eit.uni-kl.de/avifile/ \
-		http://mplayerhq.hu/MPlayer/releases/ \
-		ftp://mplayerhq.hu/MPlayer/releases/ \
-		http://www2.mplayerhq.hu/MPlayer/releases/ \
-		http://ftp.mplayerhq.hu/MPlayer/releases/ \
-		http://ftp2.mplayerhq.hu/MPlayer/releases/
-DISTFILES=	w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2 \
-		binaries-${CODEC_VERSION}.tgz \
+		http://mplayerhq.hu/MPlayer/releases/:w32codec \
+		ftp://mplayerhq.hu/MPlayer/releases/:w32codec \
+		http://www2.mplayerhq.hu/MPlayer/releases/:w32codec \
+		http://ftp.mplayerhq.hu/MPlayer/releases/:w32codec \
+		http://ftp2.mplayerhq.hu/MPlayer/releases/:w32codec
+DISTFILES=	w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2:w32codec \
+		binaries-${CODEC_VERSION}.tgz:binaries \
 		wmvds32.ax.gz
-EXTRACT_ONLY=	${DISTFILES:S/wmvds32.ax.gz//:S/binaries-${CODEC_VERSION}.tgz//}
+EXTRACT_ONLY=	w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2
 
 MAINTAINER=	holger@eit.uni-kl.de
 
@@ -28,12 +27,12 @@ RESTRICTED=	Unsure of codec\'s license
 ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/w32codec-${CODEC_MPLAYER_VERSION}
+WRKSRC=		${WRKDIR}/w32codec-${CODEC_MPLAYER_VERSION:S/pre7//}
 
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
 CODEC_VERSION=	011002
-CODEC_MPLAYER_VERSION=	0.60
+CODEC_MPLAYER_VERSION=	0.90pre7
 # Used by other ports to detect if this is installed
 CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index d6b5d37e6f84..3499605f6191 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,3 +1,3 @@
-MD5 (w32codec-0.60.tar.bz2) = 7f9a2759d0069146f6f28d1a1ab0db83
+MD5 (w32codec-0.90pre7.tar.bz2) = 4d72857f4a478bff48c78aca8dee5e8b
 MD5 (binaries-011002.tgz) = 4db4edeeceefb9353b15b047207fa6d3
 MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index 54b28506e019..f485a03d85dc 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -1,11 +1,18 @@
 lib/win32/3ivxdmo.dll
+lib/win32/CLRVIDDC.DLL
+lib/win32/CtWbJpg.DLL
+lib/win32/LCodcCMP.dll
+lib/win32/acelpdec.ax
+lib/win32/alf2cd.acm
 lib/win32/apmpg4v1.apl
 lib/win32/apmpg4v1.dll
 lib/win32/asusasv2.dll
 lib/win32/asusasvd.dll
 lib/win32/ativcr2.dll
+lib/win32/atrac3.acm
 lib/win32/avimszh.dll
 lib/win32/avizlib.dll
+lib/win32/clrviddd.dll
 lib/win32/divx.dll
 lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
@@ -15,7 +22,6 @@ lib/win32/divxcfvk.dll
 lib/win32/divxcvki.ax
 lib/win32/divxcvki.dll
 lib/win32/divxdec.ax
-lib/win32/acelpdec.ax
 lib/win32/huffyuv.dll
 lib/win32/i263_32.drv
 lib/win32/iccvid.dll
@@ -49,11 +55,18 @@ lib/win32/msrle32.dll
 lib/win32/msscds32.ax
 lib/win32/msvidc32.dll
 lib/win32/mvoiced.vwp
+lib/win32/nsrt2432.acm
 lib/win32/pclepim1.dll
 lib/win32/qdv.dll
+lib/win32/qpeg32.dll
+lib/win32/rt32dcmp.dll
+lib/win32/sp5x_32.dll
 lib/win32/tm20dec.ax
+lib/win32/tsccvid.dll
 lib/win32/tssoft32.acm
 lib/win32/ubv263d+.ax
+lib/win32/ubvmp4d.dll
+lib/win32/vgpix32d.dll
 lib/win32/vivog723.acm
 lib/win32/voxmsdec.ax
 lib/win32/vp31vfw.dll