o PORTVERSION change:

	- change it so that it complies to portlint checks
	- increase it due to port contents change
o Add both WM9 and Quicktime(TM) codecs
o Update MASTER_SITES

Reviewed by:	freebsd-multimedia mailing list
Approved by:	maintainer (sort of, hasted due to incoming mplayer
		update)

3 files changed, 44 insertions, 12 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 354980b5cbe7..d9df4514850e 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -6,18 +6,23 @@
 #
 
 PORTNAME=	win32-codecs
-PORTVERSION=	${CODEC_VERSION}.0.${CODEC_MPLAYER_VERSION}
+PORTVERSION=	${CODEC_VERSION}.1.${CODEC_MPLAYER_VERSION:S/pre/.p/}
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://avifile.sourceforge.net/:binaries \
 		http://ernie.eit.uni-kl.de/avifile/ \
-		http://mplayerhq.hu/MPlayer/releases/:w32codec \
-		ftp://mplayerhq.hu/MPlayer/releases/:w32codec \
-		http://www2.mplayerhq.hu/MPlayer/releases/:w32codec \
+		http://www1.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
+		http://www2.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
+		http://www.mplayerhq.hu/MPlayer/releases/:w32codec \
+		http://ftp.lug.udel.edu/MPlayer/releases/%SUBDIR%/:mplayer_extracodec,w32codec \
+		ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/:mplayer_extracodec \
 		ftp://ftp.mplayerhq.hu/MPlayer/releases/:w32codec \
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/:w32codec
+		ftp://ftp.lug.udel.edu/MPlayer/releases/%SUBDIR%/:mplayer_extracodec,w32codec
+MASTER_SITE_SUBDIR=	codecs/:mplayer_extracodec
 DISTFILES=	w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2:w32codec \
-		binaries-${CODEC_VERSION}.tgz:binaries \
-		wmvds32.ax.gz
+		binaries-${CODEC_VERSION}.tgz:binaries,DEFAULT \
+		Win32_dmo.tgz:binaries \
+		qt5dlls.tar.bz2:mplayer_extracodec
 EXTRACT_ONLY=	w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2
 
 MAINTAINER=	holger@e-gitt.net
@@ -36,11 +41,27 @@ CODEC_MPLAYER_VERSION=	0.90pre7
 # 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
+# extraction wrksrc
+ADDITIONAL_CODECS_WRKSRC=	Win32_dmo win32 \
+				qt5dlls
+
 post-extract:
-	@cd ${WRKDIR} && ${TAR} xfz \
-		${DISTDIR}/binaries-${CODEC_VERSION}.tgz
-	@${INSTALL} ${WRKDIR}/win32/* ${WRKSRC}
-	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKSRC}/wmvds32.ax
+.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}
+.endfor
+.for dir in ${ADDITIONAL_CODECS_WRKSRC}
+	@${INSTALL} ${WRKDIR}/${dir}/* ${WRKSRC}
+.endfor
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/win32
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index 3499605f6191..8cbc019fcd80 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,3 +1,4 @@
 MD5 (w32codec-0.90pre7.tar.bz2) = 4d72857f4a478bff48c78aca8dee5e8b
 MD5 (binaries-011002.tgz) = 4db4edeeceefb9353b15b047207fa6d3
-MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7
+MD5 (Win32_dmo.tgz) = 4b642e89759aad5b660f5a774cb470b9
+MD5 (qt5dlls.tar.bz2) = 53c505e3527cab920a85b5049027b185
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index f485a03d85dc..d9f685ab5fc5 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -59,6 +59,11 @@ 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
@@ -70,7 +75,12 @@ lib/win32/vgpix32d.dll
 lib/win32/vivog723.acm
 lib/win32/voxmsdec.ax
 lib/win32/vp31vfw.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/%%PKGNAME%%
 @dirrm lib/win32