3 files changed, 32 insertions, 32 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index fafa115a8578..2c58a2f35ed7 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -7,32 +7,25 @@
 
 PORTNAME=	win32-codecs
 PORTVERSION=	2.${CODEC_MPLAYER_VERSION:S/pre/.p/}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
-		http://www2.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
-		http://www.mplayerhq.hu/MPlayer/releases/codecs/:w32codec \
-		http://ftp.lug.udel.edu/MPlayer/releases/codecs/:mplayer_extracodec,w32codec \
-		http://www1.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
-		http://www2.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
-		ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/:w32codec \
-		ftp://ftp.lug.udel.edu/MPlayer/releases/codecs/:mplayer_extracodec,w32codec
+MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
+		http://www2.mplayerhq.hu/MPlayer/releases/codecs/ \
+		http://www.mplayerhq.hu/MPlayer/releases/codecs/ \
+		http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
+		http://www2.mplayerhq.hu/MPlayer/releases/codecs/ \
+		ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/ \
+		ftp://ftp.lug.udel.edu/MPlayer/releases/codecs/
+DISTFILES=	win32codecs-20040703.tar.bz2 \
+		${ADDITIONAL_CODECS_DISTFILES}
 DIST_SUBDIR=	win32
-DISTFILES=	win32codecs.tar.bz2:w32codec \
-		qt6dlls.tar.bz2:mplayer_extracodec \
-		qtextras.tar.bz2:mplayer_extracodec \
-		rp9codecs.tar.bz2:mplayer_extracodec \
-		xanimdlls.tar.bz2:mplayer_extracodec
-EXTRACT_ONLY=	win32codecs.tar.bz2
+EXTRACT_ONLY=	win32codecs-20040703.tar.bz2
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	Huge compilation of Win32 binary codecs, including MPEG-4(DivX ;-))
 
 RESTRICTED=	Unsure of codec\'s license
 
-BROKEN=		"Unfetchable"
-
 ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
@@ -40,16 +33,18 @@ WRKSRC=		${WRKDIR}/w32codec-${CODEC_MPLAYER_VERSION:S/pre7//}
 
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
-CODEC_MPLAYER_VERSION=	0.90
+CODEC_MPLAYER_VERSION=	0.99
 # Used by other ports to detect if this is installed
 CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
 # additional codec packs
-ADDITIONAL_CODECS_DISTFILES=	qt6dlls.tar.bz2 qtextras.tar.bz2 \
-				xanimdlls.tar.bz2 rp9codecs.tar.bz2
+ADDITIONAL_CODECS_DISTFILES=	qt65dlls-20040704.tar.bz2 \
+				qtextras-20040704.tar.bz2 \
+				rp9codecs-20040626.tar.bz2 \
+				xanimdlls-20040626.tar.bz2
+
 # extraction wrksrc
-ADDITIONAL_CODECS_WRKSRC=	win32codecs qt6dlls qtextras \
-				rp9codecs xanimdlls
+ADDITIONAL_CODECS_WRKSRC=	${DISTFILES:S/.tar.bz2//}
 
 post-extract:
 .for file in ${ADDITIONAL_CODECS_DISTFILES}
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index d84be7653f49..fa00f7822ba3 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,10 +1,10 @@
-MD5 (win32/win32codecs.tar.bz2) = 10e934a4a5609fa2e094acb0f6c1b976
-SIZE (win32/win32codecs.tar.bz2) = 6803247
-MD5 (win32/qt6dlls.tar.bz2) = 8915f44dcea2dd3387b354048f63d69b
-SIZE (win32/qt6dlls.tar.bz2) = 2628353
-MD5 (win32/qtextras.tar.bz2) = 784b6c1ecf878a6d6963b66e5b76ac83
-SIZE (win32/qtextras.tar.bz2) = 701356
-MD5 (win32/rp9codecs.tar.bz2) = 0f3c2ae3e7cc1679ecc0d1b9b3c67928
-SIZE (win32/rp9codecs.tar.bz2) = 511367
-MD5 (win32/xanimdlls.tar.bz2) = c2787acd99d905fa995ad40a8f52abb8
-SIZE (win32/xanimdlls.tar.bz2) = 318805
+MD5 (win32/win32codecs-20040703.tar.bz2) = 90ba6a76ded2f9fd9f865024bd8de3d3
+SIZE (win32/win32codecs-20040703.tar.bz2) = 7176589
+MD5 (win32/qt65dlls-20040704.tar.bz2) = 9fb88417aef157e2f1f5b7be57eaed7b
+SIZE (win32/qt65dlls-20040704.tar.bz2) = 3229331
+MD5 (win32/qtextras-20040704.tar.bz2) = c28b85f16e00470cfa65f2d6f2f3f01a
+SIZE (win32/qtextras-20040704.tar.bz2) = 721908
+MD5 (win32/rp9codecs-20040626.tar.bz2) = 00e075a083163317bce06435134602e4
+SIZE (win32/rp9codecs-20040626.tar.bz2) = 511450
+MD5 (win32/xanimdlls-20040626.tar.bz2) = a7c980a1a94fbac6ebd34c7485a1891d
+SIZE (win32/xanimdlls-20040626.tar.bz2) = 318850
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index 7d21e3e10f54..9516e2c89cf4 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -1,5 +1,9 @@
 @comment win32codecs
 lib/win32/wmv8ds32.ax
+lib/win32/vp5vfw.dll
+lib/win32/vp6vfw.dll
+lib/win32/wnvplay1.dll
+lib/win32/wnvwinx.dll
 lib/win32/avimszh.dll
 lib/win32/m3jpeg32.dll
 lib/win32/msnaudio.acm
@@ -77,6 +81,7 @@ lib/win32/vsswlt.dll
 lib/win32/ultimo.dll
 lib/win32/vp4vfw.dll
 @comment qt6dlls
+lib/win32/AvidQTAVUICodec.qtx
 lib/win32/QuickTimeEssentials.qtx
 lib/win32/QuickTime.qts
 lib/win32/QuickTimeInternetExtras.qtx