Update to 2.0.90.

from the PR:
Changes in this update:
- Quicktime 6 instead of Quicktime 5
- added Realplayer 9 codecs
- added xanim codecs
- Win32_dmo (Windows Media 9) is obsolete, it is included in
  the main win32codecs
- binaries.zip also adds no real new drivers and is obsolete.

With Win32_dmo and binaries, everything from avifile has
disappeared and I removed the avifile version number from win32-codecs.

PR:		ports/55217
Submitted by:	maintainer

3 files changed, 108 insertions, 94 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index e95fa52d6ec7..a08d2930ac87 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	win32-codecs
-PORTVERSION=	${CODEC_VERSION}.2.${CODEC_MPLAYER_VERSION:S/pre/.p/}
+PORTVERSION=	2.${CODEC_MPLAYER_VERSION:S/pre/.p/}
 CATEGORIES=	multimedia audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:avifile/} \
-		http://avifile.sourceforge.net/:binaries \
-		http://www1.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
+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 \
@@ -18,11 +16,11 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:avifile/} \
 		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_SITE_SUBDIR=	avifile/:avifile
+DIST_SUBDIR=	win32
 DISTFILES=	win32codecs.tar.bz2:w32codec \
-		binaries-${CODEC_VERSION}.tgz:avifile,binaries \
-		Win32_dmo.tgz:avifile,binaries \
-		qt5dlls.tar.bz2:mplayer_extracodec
+		qt6dlls.tar.bz2:mplayer_extracodec \
+		rp9codecs.tar.bz2:mplayer_extracodec \
+		xanimdlls.tar.bz2:mplayer_extracodec
 EXTRACT_ONLY=	win32codecs.tar.bz2
 
 MAINTAINER=	holger@e-gitt.net
@@ -37,29 +35,21 @@ WRKSRC=		${WRKDIR}/w32codec-${CODEC_MPLAYER_VERSION:S/pre7//}
 
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
-CODEC_VERSION=	011002
-CODEC_MPLAYER_VERSION=	0.90pre7
+CODEC_MPLAYER_VERSION=	0.90
 # Used by other ports to detect if this is installed
 CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
 # additional codec packs
-ADDITIONAL_CODECS_DISTFILES=	binaries-${CODEC_VERSION}.tgz \
-				Win32_dmo.tgz
-# additional QuickTime(TM) codec packs
-ADDITIONAL_CODECS_QT_DISTFILES=	qt5dlls.tar.bz2
+ADDITIONAL_CODECS_DISTFILES=	qt6dlls.tar.bz2 xanimdlls.tar.bz2 \
+				rp9codecs.tar.bz2
 # extraction wrksrc
-ADDITIONAL_CODECS_WRKSRC=	Win32_dmo win32 \
-				win32codecs \
-				qt5dlls
+ADDITIONAL_CODECS_WRKSRC=	win32codecs \
+				qt6dlls rp9codecs xanimdlls
 
 post-extract:
 .for file in ${ADDITIONAL_CODECS_DISTFILES}
-	@cd ${WRKDIR} && ${TAR} xzf \
-		${DISTDIR}/${file}
-.endfor
-.for file in ${ADDITIONAL_CODECS_QT_DISTFILES}
 	@cd ${WRKDIR} && ${TAR} xyf \
-		${DISTDIR}/${file}
+		${DISTDIR}/${DIST_SUBDIR}/${file}
 .endfor
 	@${MKDIR} ${WRKSRC}
 .for dir in ${ADDITIONAL_CODECS_WRKSRC}
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index 22a78e58e505..2046ff71ba09 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,4 +1,4 @@
-MD5 (win32codecs.tar.bz2) = ba90cc628ffb4cd646e79e76249a71c0
-MD5 (binaries-011002.tgz) = 4db4edeeceefb9353b15b047207fa6d3
-MD5 (Win32_dmo.tgz) = 4b642e89759aad5b660f5a774cb470b9
-MD5 (qt5dlls.tar.bz2) = 53c505e3527cab920a85b5049027b185
+MD5 (win32/win32codecs.tar.bz2) = b6044b95d9c9c36f24d52435f9ed7569
+MD5 (win32/qt6dlls.tar.bz2) = 8915f44dcea2dd3387b354048f63d69b
+MD5 (win32/rp9codecs.tar.bz2) = 0f3c2ae3e7cc1679ecc0d1b9b3c67928
+MD5 (win32/xanimdlls.tar.bz2) = c2787acd99d905fa995ad40a8f52abb8
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index db4219e29da1..4f046074c7c0 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -1,88 +1,112 @@
-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
+@comment win32codecs
+lib/win32/wmv8ds32.ax
+lib/win32/avimszh.dll
+lib/win32/m3jpeg32.dll
+lib/win32/msnaudio.acm
+lib/win32/tssoft32.acm
+lib/win32/imc32.acm
 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/mcdvd_32.dll
+lib/win32/lhacm.acm
+lib/win32/msms001.vwp
+lib/win32/mvoiced.vwp
 lib/win32/divx.dll
-lib/win32/divx_c32.ax
+lib/win32/l3codeca.acm
+lib/win32/LCodcCMP.dll
+lib/win32/msh261.drv
+lib/win32/msg711.acm
+lib/win32/ir50_32.dll
 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/huffyuv.dll
-lib/win32/i263_32.drv
-lib/win32/iccvid.dll
-lib/win32/icmw_32.dll
-lib/win32/imaadp32.acm
-lib/win32/imc32.acm
-lib/win32/ir32_32.dll
+lib/win32/atrac3.acm
+lib/win32/l3codecx.ax
 lib/win32/ir41_32.dll
-lib/win32/ir41_qc.dll
-lib/win32/ir50_32.dll
-lib/win32/ir50_qc.dll
-lib/win32/ir50_qcx.dll
+lib/win32/msvidc32.dll
+lib/win32/ativcr2.dll
+lib/win32/vivog723.acm
+lib/win32/ir32_32.dll
+lib/win32/tm20dec.ax
+lib/win32/icmw_32.dll
+lib/win32/rt32dcmp.dll
 lib/win32/ivvideo.dll
-lib/win32/jp2avi.dll
-lib/win32/l3codeca.acm
-lib/win32/l3codecx.ax
-lib/win32/lhacm.acm
-lib/win32/m3jp2k32.dll
-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/i263_32.drv
 lib/win32/mpg4ds32.ax
-lib/win32/msadp32.acm
-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/sp5x_32.dll
+lib/win32/mpg4c32.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/QuickTime.qts
-lib/win32/QuickTime.qts.htcfg
-lib/win32/QuickTimeEssentials.qtx
-lib/win32/QuickTimeInternetExtras.qtx
-lib/win32/qtmlClient.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/acelpdec.ax
+lib/win32/avizlib.dll
+lib/win32/clrviddd.dll
+lib/win32/CtWbJpg.DLL
+lib/win32/divxdec.ax
+lib/win32/pclepim1.dll
 lib/win32/ubvmp4d.dll
+lib/win32/ubv263d+.ax
+lib/win32/msrle32.dll
+lib/win32/divxc32.dll
+lib/win32/m3jpegdec.ax
+lib/win32/alf2cd.acm
+lib/win32/msadp32.acm
+lib/win32/divx_c32.ax
+lib/win32/msgsm32.acm
+lib/win32/imaadp32.acm
+lib/win32/iccvid.dll
 lib/win32/vgpix32d.dll
-lib/win32/vivog723.acm
+lib/win32/huffyuv.dll
 lib/win32/voxmsdec.ax
+lib/win32/CLRVIDDC.DLL
+lib/win32/qdv.dll
+lib/win32/mcmjpg32.dll
+lib/win32/nsrt2432.acm
 lib/win32/vp31vfw.dll
+lib/win32/tsccvid.dll
+lib/win32/wmvds32.ax
+lib/win32/jp2avi.dll
+lib/win32/m3jp2k32.dll
 lib/win32/wma9dmod.dll
 lib/win32/wmadmod.dll
 lib/win32/wmspdmod.dll
-lib/win32/wmv8ds32.ax
 lib/win32/wmv9dmod.dll
 lib/win32/wmvdmod.dll
-lib/win32/wmvds32.ax
+lib/win32/vssh264.dll
+lib/win32/vssh264core.dll
+lib/win32/vssh264dec.dll
+lib/win32/vsslight.dll
+lib/win32/vsswlt.dll
+@comment qt6dlls
+lib/win32/QuickTimeEssentials.qtx
+lib/win32/QuickTime.qts
+lib/win32/QuickTimeInternetExtras.qtx
+lib/win32/qtmlClient.dll
+@comment rp8codecs
+lib/win32/dnet.so.6.0
+lib/win32/drv2.so.6.0
+lib/win32/tokr.so.6.0
+lib/win32/drv4.so.6.0
+lib/win32/dspr.so.6.0
+lib/win32/atrc.so.6.0
+lib/win32/drv3.so.6.0
+lib/win32/ddnt.so.6.0
+lib/win32/cook.so.6.0
+lib/win32/sipr.so.6.0
+lib/win32/tokf.so.6.0
+@comment xanim
+lib/win32/vid_3ivX.xa
+lib/win32/vid_3ivX_d3.5_linuxELFx86c6.xa
+lib/win32/vid_cvid.xa
+lib/win32/vid_cvid_2.1_linuxELFx86c6.xa
+lib/win32/vid_cyuv.xa
+lib/win32/vid_cyuv_1.0_linuxELFx86c6.xa
+lib/win32/vid_h261.xa
+lib/win32/vid_h261_1.0_linuxELFx86c6.xa
+lib/win32/vid_h263.xa
+lib/win32/vid_h263_1.1_linuxELFx86c6.xa
+lib/win32/vid_iv32.xa
+lib/win32/vid_iv32_2.1_linuxELFx86c6.xa
+lib/win32/vid_iv41.xa
+lib/win32/vid_iv41_1.1_linuxELFx86c6.xa
+lib/win32/vid_iv50.xa
+lib/win32/vid_iv50_1.0_linuxELFx86c6.xa
 lib/win32/%%PKGNAME%%
 @dirrm lib/win32