o add the codecs from mplayer-codecs, this port will hold all win32

  codecs from now on, this is not that much a bloat since all depending
  ports tend to use (in the long run) all the same codecs
o prepare to remove mplayer-codecs port since it is no longer
  necessary

Approved by:	MAINTAINERs (from both mplayer-codecs/win32-codecs)

3 files changed, 40 insertions, 5 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 7abaeba04def..256fdd556620 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -6,14 +6,20 @@
 #
 
 PORTNAME=	win32-codecs
-PORTVERSION=	${CODEC_VERSION}
+PORTVERSION=	${CODEC_VERSION}.1.${CODEC_MPLAYER_VERSION}
 CATEGORIES=	graphics audio
 MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ \
 		http://avifile.sourceforge.net/ \
-		http://www.toon.eu.org/divx/
-DISTFILES=	binaries-${CODEC_VERSION}.zip \
+		http://www.toon.eu.org/divx/ \
+		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-${CODEC_MPLAYER_VERSION}.zip \
+		binaries-${CODEC_VERSION}.zip \
 		wmvds32.ax.gz
-EXTRACT_ONLY=	binaries-${CODEC_VERSION}.zip
+EXTRACT_ONLY=	${DISTFILES:S/wmvds32.ax.gz//}
 
 MAINTAINER=	holger@eit.uni-kl.de
 
@@ -21,12 +27,16 @@ RESTRICTED=	Unsure of codec\'s license
 
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
+EXTRACT_BEFORE_ARGS=	-n -q
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+PLIST_SUB=	PKGNAME=${PKGNAME}
+
 CODEC_VERSION=	010122
+CODEC_MPLAYER_VERSION=	0.18
 # Used by other ports to detect if this is installed
-CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/wmvds32.ax
+CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
 post-extract:
 	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/wmvds32.ax
@@ -35,5 +45,8 @@ do-install:
 	@${MKDIR} ${PREFIX}/lib/win32
 	@${CHMOD} 0555 ${PREFIX}/lib/win32
 	@${INSTALL_DATA} ${WRKDIR}/* ${PREFIX}/lib/win32
+# marker file
+	@${CP} /dev/null ${PREFIX}/lib/win32/${PKGNAME}
+	@${CHMOD} 0444 ${PREFIX}/lib/win32/${PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index 75de48921143..7072c50db12c 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,2 +1,3 @@
+MD5 (w32codec-0.18.zip) = 80afcd781e6c6a7d93989e9128d8c753
 MD5 (binaries-010122.zip) = ffc44e68b581994613931a9e47500446
 MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index c5905b9dac64..a158de8f0ae3 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -1,10 +1,18 @@
+lib/win32/asusasv2.dll
+lib/win32/asusasvd.dll
 lib/win32/ativcr2.dll
+lib/win32/avimszh.dll
+lib/win32/avizlib.dll
 lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
 lib/win32/divxc32.dll
 lib/win32/divxc32f.dll
 lib/win32/acelpdec.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/ir41_32.dll
@@ -12,10 +20,23 @@ lib/win32/ir41_qc.dll
 lib/win32/ir50_32.dll
 lib/win32/ir50_qc.dll
 lib/win32/ir50_qcx.dll
+lib/win32/l3codeca.acm
+lib/win32/lhacm.acm
 lib/win32/m3jpeg32.dll
+lib/win32/mcmjpg32.dll
 lib/win32/mpg4c32.dll
+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/msvidc32.dll
+lib/win32/qdv.dll
+lib/win32/tm20dec.ax
+lib/win32/tssoft32.acm
 lib/win32/voxmsdec.ax
+lib/win32/wmv8ds32.ax
 lib/win32/wmvds32.ax
+lib/win32/%%PKGNAME%%
 @dirrm lib/win32