6 files changed, 66 insertions, 40 deletions

diff --git a/graphics/win32-codecs/Makefile b/graphics/win32-codecs/Makefile
index 4cdb300127ae..b28c20051103 100644
--- a/graphics/win32-codecs/Makefile
+++ b/graphics/win32-codecs/Makefile
@@ -6,46 +6,47 @@
 #
 
 PORTNAME=	win32-codecs
-PORTVERSION=	${CODEC_VERSION}.1.${CODEC_MPLAYER_VERSION}
+PORTVERSION=	${CODEC_VERSION}.0.${CODEC_MPLAYER_VERSION}
 CATEGORIES=	graphics audio
-MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ \
-		http://avifile.sourceforge.net/ \
+MASTER_SITES=	http://avifile.sourceforge.net/ \
 		http://www.toon.eu.org/divx/ \
+		http://ernie.eit.uni-kl.de/avifile/ \
 		http://mplayerhq.hu/MPlayer/releases/ \
 		ftp://mplayerhq.hu/MPlayer/releases/ \
-		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
-		http://codeczone.virtualave.net/ \
-		http://www.rrr.de/~riggs/mplayer/
-DISTFILES=	w32codec-0.18.zip \
-		w32codec-diff-0.18-${CODEC_MPLAYER_VERSION}.zip \
-		binaries-${CODEC_VERSION}.zip \
+		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 \
 		wmvds32.ax.gz
-EXTRACT_ONLY=	${DISTFILES:S/wmvds32.ax.gz//}
+EXTRACT_ONLY=	${DISTFILES:S/wmvds32.ax.gz//:S/binaries-${CODEC_VERSION}.tgz//}
 
 MAINTAINER=	holger@eit.uni-kl.de
 
 RESTRICTED=	Unsure of codec\'s license
 
 ONLY_FOR_ARCHS=	i386
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-n -q
+USE_BZIP2=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/w32codec-${CODEC_MPLAYER_VERSION}
 
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
-CODEC_VERSION=	010122
-CODEC_MPLAYER_VERSION=	0.50
+CODEC_VERSION=	011002
+CODEC_MPLAYER_VERSION=	0.60
 # Used by other ports to detect if this is installed
 CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
 post-extract:
-	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/wmvds32.ax
+	@cd ${WRKDIR} && ${TAR} xfz \
+		${DISTDIR}/binaries-${CODEC_VERSION}.tgz
+	@${INSTALL} ${WRKDIR}/win32/* ${WRKSRC}
+	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKSRC}/wmvds32.ax
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/win32
 	@${CHMOD} 0555 ${PREFIX}/lib/win32
-	@${INSTALL_DATA} ${WRKDIR}/* ${PREFIX}/lib/win32
+	@${INSTALL_DATA} ${WRKSRC}/* ${PREFIX}/lib/win32
 # marker file
 	@${CP} /dev/null ${PREFIX}/lib/win32/${PKGNAME}
 	@${CHMOD} 0444 ${PREFIX}/lib/win32/${PKGNAME}
diff --git a/graphics/win32-codecs/distinfo b/graphics/win32-codecs/distinfo
index dfce9543c106..d6b5d37e6f84 100644
--- a/graphics/win32-codecs/distinfo
+++ b/graphics/win32-codecs/distinfo
@@ -1,4 +1,3 @@
-MD5 (w32codec-0.18.zip) = 80afcd781e6c6a7d93989e9128d8c753
-MD5 (w32codec-diff-0.18-0.50.zip) = 27e709222f59f7f078fd3219cdf9d32e
-MD5 (binaries-010122.zip) = ffc44e68b581994613931a9e47500446
+MD5 (w32codec-0.60.tar.bz2) = 7f9a2759d0069146f6f28d1a1ab0db83
+MD5 (binaries-011002.tgz) = 4db4edeeceefb9353b15b047207fa6d3
 MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7
diff --git a/graphics/win32-codecs/pkg-plist b/graphics/win32-codecs/pkg-plist
index 387066bec43c..54b28506e019 100644
--- a/graphics/win32-codecs/pkg-plist
+++ b/graphics/win32-codecs/pkg-plist
@@ -1,4 +1,6 @@
 lib/win32/3ivxdmo.dll
+lib/win32/apmpg4v1.apl
+lib/win32/apmpg4v1.dll
 lib/win32/asusasv2.dll
 lib/win32/asusasvd.dll
 lib/win32/ativcr2.dll
@@ -9,6 +11,9 @@ lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
 lib/win32/divxc32.dll
 lib/win32/divxc32f.dll
+lib/win32/divxcfvk.dll
+lib/win32/divxcvki.ax
+lib/win32/divxcvki.dll
 lib/win32/divxdec.ax
 lib/win32/acelpdec.ax
 lib/win32/huffyuv.dll
@@ -23,11 +28,14 @@ lib/win32/ir41_qc.dll
 lib/win32/ir50_32.dll
 lib/win32/ir50_qc.dll
 lib/win32/ir50_qcx.dll
+lib/win32/ivvideo.dll
 lib/win32/l3codeca.acm
 lib/win32/l3codecx.ax
 lib/win32/lhacm.acm
 lib/win32/m3jpeg32.dll
 lib/win32/m3jpegdec.ax
+lib/win32/m3jpegenc.ax
+lib/win32/mcdvd_32.dll
 lib/win32/mcmjpg32.dll
 lib/win32/mpg4c32.dll
 lib/win32/mpg4ds32.ax
@@ -36,12 +44,17 @@ lib/win32/msg711.acm
 lib/win32/msgsm32.acm
 lib/win32/msh261.drv
 lib/win32/msms001.vwp
+lib/win32/msnaudio.acm
+lib/win32/msrle32.dll
+lib/win32/msscds32.ax
 lib/win32/msvidc32.dll
 lib/win32/mvoiced.vwp
+lib/win32/pclepim1.dll
 lib/win32/qdv.dll
 lib/win32/tm20dec.ax
 lib/win32/tssoft32.acm
 lib/win32/ubv263d+.ax
+lib/win32/vivog723.acm
 lib/win32/voxmsdec.ax
 lib/win32/vp31vfw.dll
 lib/win32/wmv8ds32.ax
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 4cdb300127ae..b28c20051103 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -6,46 +6,47 @@
 #
 
 PORTNAME=	win32-codecs
-PORTVERSION=	${CODEC_VERSION}.1.${CODEC_MPLAYER_VERSION}
+PORTVERSION=	${CODEC_VERSION}.0.${CODEC_MPLAYER_VERSION}
 CATEGORIES=	graphics audio
-MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ \
-		http://avifile.sourceforge.net/ \
+MASTER_SITES=	http://avifile.sourceforge.net/ \
 		http://www.toon.eu.org/divx/ \
+		http://ernie.eit.uni-kl.de/avifile/ \
 		http://mplayerhq.hu/MPlayer/releases/ \
 		ftp://mplayerhq.hu/MPlayer/releases/ \
-		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
-		http://codeczone.virtualave.net/ \
-		http://www.rrr.de/~riggs/mplayer/
-DISTFILES=	w32codec-0.18.zip \
-		w32codec-diff-0.18-${CODEC_MPLAYER_VERSION}.zip \
-		binaries-${CODEC_VERSION}.zip \
+		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 \
 		wmvds32.ax.gz
-EXTRACT_ONLY=	${DISTFILES:S/wmvds32.ax.gz//}
+EXTRACT_ONLY=	${DISTFILES:S/wmvds32.ax.gz//:S/binaries-${CODEC_VERSION}.tgz//}
 
 MAINTAINER=	holger@eit.uni-kl.de
 
 RESTRICTED=	Unsure of codec\'s license
 
 ONLY_FOR_ARCHS=	i386
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-n -q
+USE_BZIP2=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/w32codec-${CODEC_MPLAYER_VERSION}
 
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
-CODEC_VERSION=	010122
-CODEC_MPLAYER_VERSION=	0.50
+CODEC_VERSION=	011002
+CODEC_MPLAYER_VERSION=	0.60
 # Used by other ports to detect if this is installed
 CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
 post-extract:
-	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/wmvds32.ax
+	@cd ${WRKDIR} && ${TAR} xfz \
+		${DISTDIR}/binaries-${CODEC_VERSION}.tgz
+	@${INSTALL} ${WRKDIR}/win32/* ${WRKSRC}
+	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKSRC}/wmvds32.ax
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/win32
 	@${CHMOD} 0555 ${PREFIX}/lib/win32
-	@${INSTALL_DATA} ${WRKDIR}/* ${PREFIX}/lib/win32
+	@${INSTALL_DATA} ${WRKSRC}/* ${PREFIX}/lib/win32
 # marker file
 	@${CP} /dev/null ${PREFIX}/lib/win32/${PKGNAME}
 	@${CHMOD} 0444 ${PREFIX}/lib/win32/${PKGNAME}
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index dfce9543c106..d6b5d37e6f84 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,4 +1,3 @@
-MD5 (w32codec-0.18.zip) = 80afcd781e6c6a7d93989e9128d8c753
-MD5 (w32codec-diff-0.18-0.50.zip) = 27e709222f59f7f078fd3219cdf9d32e
-MD5 (binaries-010122.zip) = ffc44e68b581994613931a9e47500446
+MD5 (w32codec-0.60.tar.bz2) = 7f9a2759d0069146f6f28d1a1ab0db83
+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 387066bec43c..54b28506e019 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -1,4 +1,6 @@
 lib/win32/3ivxdmo.dll
+lib/win32/apmpg4v1.apl
+lib/win32/apmpg4v1.dll
 lib/win32/asusasv2.dll
 lib/win32/asusasvd.dll
 lib/win32/ativcr2.dll
@@ -9,6 +11,9 @@ lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
 lib/win32/divxc32.dll
 lib/win32/divxc32f.dll
+lib/win32/divxcfvk.dll
+lib/win32/divxcvki.ax
+lib/win32/divxcvki.dll
 lib/win32/divxdec.ax
 lib/win32/acelpdec.ax
 lib/win32/huffyuv.dll
@@ -23,11 +28,14 @@ lib/win32/ir41_qc.dll
 lib/win32/ir50_32.dll
 lib/win32/ir50_qc.dll
 lib/win32/ir50_qcx.dll
+lib/win32/ivvideo.dll
 lib/win32/l3codeca.acm
 lib/win32/l3codecx.ax
 lib/win32/lhacm.acm
 lib/win32/m3jpeg32.dll
 lib/win32/m3jpegdec.ax
+lib/win32/m3jpegenc.ax
+lib/win32/mcdvd_32.dll
 lib/win32/mcmjpg32.dll
 lib/win32/mpg4c32.dll
 lib/win32/mpg4ds32.ax
@@ -36,12 +44,17 @@ lib/win32/msg711.acm
 lib/win32/msgsm32.acm
 lib/win32/msh261.drv
 lib/win32/msms001.vwp
+lib/win32/msnaudio.acm
+lib/win32/msrle32.dll
+lib/win32/msscds32.ax
 lib/win32/msvidc32.dll
 lib/win32/mvoiced.vwp
+lib/win32/pclepim1.dll
 lib/win32/qdv.dll
 lib/win32/tm20dec.ax
 lib/win32/tssoft32.acm
 lib/win32/ubv263d+.ax
+lib/win32/vivog723.acm
 lib/win32/voxmsdec.ax
 lib/win32/vp31vfw.dll
 lib/win32/wmv8ds32.ax